From 508dc3a95de50de4a4d07d0a72a18e40d55b0e2e Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Tue, 29 Aug 2023 06:05:26 +0800
Subject: Allow bitwise or expressions and numeric literals in spirv_asm blocks
 (#3157)

* Add -spirv-core-grammar option to load alternate spirv defs

Also embed a version to use by default

* Use perfect hash for spv op lookup

* Neaten perfect hash embedding

* Refactor spirv grammar lookup in preperation for more kinds of lookups

* Load spirv capability list from spec

* Add all SPIR-V enums to lookup table

* regenerate vs projects

* appease msvc

* Use string slices for spir-v core grammar lookups

* wiggle

* comment

* Add OpInfo for spv ops

* regenerate vs projects

* Embed op names

* Add min/max operand counts and enum categories to spirv info

* neaten

* Operand kinds for spirv ops

* Store and embed all information relating to spirv enums and qualifiers

* Use SPIR-V spec to position instructions in spirv_asm blocks

* Neaten spir-v info embedding

* Neaten perfect hash embedding

* Add assignment syntax to spirv_asm snippets

* Better errors for spirv_asm parser

* Add warning for too many operands in spirv asm

* squash warnings

* neaten

* test wiggle

* Lookup enums for spirv

* Put OpCapability and OpExtension in the correct place for spirv_asm blocks

* Tests for OpCapability and OpExtension

* ci wiggle

* Add expected failure

* Allow raising immediate values to constant ids where necessary in spirv_asm blocks

* Allow bitwise or expressions and numeric literals in spirv_asm blocks

* test numeric literals

* Fix memory issues.

* fix.

---------

Co-authored-by: Yong He <yonghe@outlook.com>
---
 .../spirv-asm/debug-instruction.slang              | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tests/language-feature/spirv-asm/debug-instruction.slang

(limited to 'tests/language-feature/spirv-asm/debug-instruction.slang')

diff --git a/tests/language-feature/spirv-asm/debug-instruction.slang b/tests/language-feature/spirv-asm/debug-instruction.slang
new file mode 100644
index 000000000..4c25189de
--- /dev/null
+++ b/tests/language-feature/spirv-asm/debug-instruction.slang
@@ -0,0 +1,29 @@
+//DIAGNOSTIC_TEST:SIMPLE(filecheck=CHECK):-emit-spirv-directly -target spirv-asm -entry computeMain -stage compute
+
+//TEST_INPUT:ubuffer(data=[1 2 3 4], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+// CHECK: ; Debug Information
+// CHECK-NOT: ; Annotations
+// CHECK: OpName %{{[a-zA-Z]+}} "INTEGERRRRRRRRRRRRRRRRRRRRR"
+// CHECK: ; Annotations
+
+//
+// This test tests that OpName is put in the correct location in the generated spriv
+//
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    spirv_asm
+    {
+        OpName $$int "INTEGERRRRRRRRRRRRRRRRRRRRR"
+    };
+    int i = dispatchThreadID.x;
+    int n = outputBuffer[i];
+    int r = spirv_asm
+    {
+        OpConstant $$int %two 2;
+        OpIMul $$int result $n %two
+    };
+    outputBuffer[i] = r;
+}
-- 
cgit v1.2.3