Add checking for hlsl register semantic. (#7118)

* Add checking for hlsl register semantic.

* Fix.

* Fix test.

* Fix switch error.

* Fix tests.

6 files changed, 72 insertions, 13 deletions

diff --git a/tests/bindings/binding-spv-storage-class.slang b/tests/bindings/binding-spv-storage-class.slang
index bb0ad3af3..7337ad77a 100644
--- a/tests/bindings/binding-spv-storage-class.slang
+++ b/tests/bindings/binding-spv-storage-class.slang
@@ -17,11 +17,11 @@ layout(shaderRecordNV) ConstantBuffer<MyStruct> myStruct : register(b0, space1);
 ConstantBuffer<MyStruct> myStruct1 : register(b1, space1);
 
 // Storage buffer
-RWStructuredBuffer<MyStruct> myStruct2 : register(b2, space1);
+RWStructuredBuffer<MyStruct> myStruct2 : register(u2, space1);
 
 // UniformConstant
-Texture2D<float>    texture: register(b3, space1);
-SamplerState        sampler: register(b4, space1);
+Texture2D<float>    texture: register(t3, space1);
+SamplerState        sampler: register(s4, space1);
 
 [shader("anyhit")]
 void main(out float3 pos)
diff --git a/tests/compute/nonuniformres-as-function-parameter.slang b/tests/compute/nonuniformres-as-function-parameter.slang
index daffc848e..38fb2a478 100644
--- a/tests/compute/nonuniformres-as-function-parameter.slang
+++ b/tests/compute/nonuniformres-as-function-parameter.slang
@@ -2,7 +2,7 @@
 //TEST:SIMPLE(filecheck=CHECK_GLSL_SPV):-target spirv -entry main -stage compute -emit-spirv-via-glsl
 //TEST:SIMPLE(filecheck=CHECK_GLSL):-target glsl -entry main -stage compute
 //TEST:SIMPLE(filecheck=CHECK_HLSL):-target hlsl -entry main -stage compute
-RWStructuredBuffer<uint> globalBuffer[] : register(t0, space0);
+RWStructuredBuffer<uint> globalBuffer[] : register(u0, space1);
 RWStructuredBuffer<uint3> outputBuffer;
 
 struct MyStruct
diff --git a/tests/diagnostics/invalid-buffer.slang b/tests/diagnostics/invalid-buffer.slang
new file mode 100644
index 000000000..53f4c5ff6
--- /dev/null
+++ b/tests/diagnostics/invalid-buffer.slang
@@ -0,0 +1,9 @@
+//TEST:SIMPLE(filecheck=CHECK): -target spirv
+
+// CHECK: ([[# @LINE+1]]): error 30400: generic type 'Buffer' used without argument
+Buffer b;
+
+[numthreads(1,1,1)]
+void computeMain()
+{
+}
\ No newline at end of file
diff --git a/tests/diagnostics/register-bindings.slang b/tests/diagnostics/register-bindings.slang
index 5c78cb10b..bad1c9aa3 100644
--- a/tests/diagnostics/register-bindings.slang
+++ b/tests/diagnostics/register-bindings.slang
@@ -3,9 +3,6 @@
 
 // Various bad forms for register bindings
 
-// Not a valid register class:
-Texture2D	a : register(DOESNT_EXIST);
-
 // No register index given:
 TextureCube b : register(t);
 
diff --git a/tests/diagnostics/register-bindings.slang.expected b/tests/diagnostics/register-bindings.slang.expected
index 74e9917d3..928cf7957 100644
--- a/tests/diagnostics/register-bindings.slang.expected
+++ b/tests/diagnostics/register-bindings.slang.expected
@@ -1,15 +1,12 @@
 result code = -1
 standard error = {
-tests/diagnostics/register-bindings.slang(7): error 39007: unknown register class: 'DOESNT_EXIST'
-Texture2D   a : register(DOESNT_EXIST);
-                         ^~~~~~~~~~~~
-tests/diagnostics/register-bindings.slang(10): error 39008: expected a register index after 't'
+tests/diagnostics/register-bindings.slang(7): error 39008: expected a register index after 't'
 TextureCube b : register(t);
                          ^
-tests/diagnostics/register-bindings.slang(13): error 39009: expected 'space', got 's'
+tests/diagnostics/register-bindings.slang(10): error 39009: expected 'space', got 's'
 SamplerState c : register(s0, s1);
                               ^~
-tests/diagnostics/register-bindings.slang(16): error 39010: expected a register space index after 'space'
+tests/diagnostics/register-bindings.slang(13): error 39010: expected a register space index after 'space'
 SamplerState d : register(s2, space);
                               ^~~~~
 }
diff --git a/tests/hlsl/invalid-semantic.slang b/tests/hlsl/invalid-semantic.slang
new file mode 100644
index 000000000..69465f731
--- /dev/null
+++ b/tests/hlsl/invalid-semantic.slang
@@ -0,0 +1,56 @@
+//TEST:SIMPLE(filecheck=CHECK): -target spirv
+
+struct Test_t
+{
+    uint4 foo;
+};
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+RWStructuredBuffer< Test_t > g_Test : register(t0, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+ConstantBuffer< Test_t > g_Test2 : register(t1, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+StructuredBuffer< Test_t > g_Test3 : register(u2, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+ByteAddressBuffer g_Test4 : register(u3, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+RWTexture2D g_Test5 : register(t4, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+Texture2D g_Test6 : register(u5, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+FeedbackTexture2D g_Test7 : register(t6, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+AppendStructuredBuffer< Test_t > g_Test8 : register(t7, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+ConsumeStructuredBuffer< Test_t > g_Test9 : register(t8, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+RWByteAddressBuffer g_Test10 : register(t9, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+RasterizerOrderedByteAddressBuffer g_Test11 : register(t10, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+SamplerState g_Test12 : register(t11, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+SamplerComparisonState g_Test13 : register(t12, space1);
+
+// CHECK: ([[# @LINE+1]]): error 31222: invalid HLSL register name
+RaytracingAccelerationStructure g_Test14 : register(u13, space1);
+
+[numthreads(1,1,1)]
+void computeMain()
+{
+    Test_t test;
+    test.foo = uint4( 0, 0, 0, 0 );
+    g_Test[0] = test;
+}
\ No newline at end of file