[Sema][HLSL] Fix naming of anyhit/closesthit shaders

[bogner]

Summary

Also test all shader types and be a bit more careful to make shaders
reasonably valid in these tests.

[bob80905]

clang/test/SemaHLSL/shader_type_attr.hlsl

30

I don't think we should expect this error, given that there is no previous declaration for doubledUp(). Maybe something else like %0 and %1 are incompatible attributes?

[bogner]

clang/test/SemaHLSL/shader_type_attr.hlsl

30

I don't necessarily disagree, but if we're going to change that I think it should be in a different change than this one.

[bob80905]

clang/test/SemaHLSL/entry_shader.hlsl

1

Why was this changed to mesh instead of "anyhit" ?

clang/test/SemaHLSL/shader_type_attr.hlsl

30

I'm also curious, why is the change from compute to pixel necessary here?

[beanz]

clang/test/SemaHLSL/shader_type_attr.hlsl

30

I suspect this change is just to prevent the presence of the compute annotation from triggering the missing numthreads error.

61

Oh interesting! DXC doesn't actually support this syntax, but I think it is worth supporting in Clang.
Should we also check for the numthreads attribute?

[bogner]

clang/test/SemaHLSL/entry_shader.hlsl

1

Another case of trying to keep things to one error - anyhit doesn't support the numthreads attribute

clang/test/SemaHLSL/shader_type_attr.hlsl

30

That's correct - just trying to keep to testing the conflicting attribute error and not have a spurious numthreads as well.

61

Hm, it might be better to stick to the syntax dxc handles for these tests at least. I'll update that. Sure, checking both attributes seems like a good idea.

[bogner]

Address feedback and simplify valid shader stage test

clang/include/clang/Basic/Attr.td

def HLSLShader : InheritableAttr {
   // ShaderType will be converted to llvm::Triple::EnvironmentType like
   //   (llvm::Triple::EnvironmentType)((uint32_t)ShaderType +
   //      (uint32_t)llvm::Triple::EnvironmentType::Pixel).
   // This will avoid update code for convert when new shader type is added.
   let Args = [
     EnumArgument<"Type", "ShaderType",
                  [
                    "pixel", "vertex", "geometry", "hull", "domain", "compute",
-                   "library", "raygeneration", "intersection", "anyHit",
-                   "closestHit", "miss", "callable", "mesh", "amplification"
+                   "library", "raygeneration", "intersection", "anyhit",
+                   "closesthit", "miss", "callable", "mesh", "amplification"
                  ],
                  [
                    "Pixel", "Vertex", "Geometry", "Hull", "Domain", "Compute",
                    "Library", "RayGeneration", "Intersection", "AnyHit",
                    "ClosestHit", "Miss", "Callable", "Mesh", "Amplification"
                  ]>
   ];
   let Documentation = [HLSLSV_ShaderTypeAttrDocs];
def ReadOnlyPlacement : InheritableAttr {
   let Documentation = [ReadOnlyPlacementDocs];
 }
 
 def AvailableOnlyInDefaultEvalMethod : InheritableAttr {
   let Spellings = [Clang<"available_only_in_default_eval_method">];
   let Subjects = SubjectList<[TypedefName], ErrorDiag>;
   let Documentation = [Undocumented];
 }
-

clang/test/SemaHLSL/entry_shader.hlsl

-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -hlsl-entry foo  -o - %s -DSHADER='"anyHit"' -verify
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -hlsl-entry foo  -o - %s -DSHADER='"mesh"' -verify
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -hlsl-entry foo  -o - %s -DSHADER='"compute"'
 
 // expected-error@+1 {{'shader' attribute on entry function does not match the target profile}}
 [numthreads(1,1,1), shader(SHADER)]
 void foo() {
 
 }

clang/test/SemaHLSL/shader_type_attr.hlsl

 static void oops() {}
 
 namespace spec {
 // expected-warning@+1 {{'shader' attribute only applies to global functions}}
 [shader("vertex")]
 static void oops() {}
 } // namespace spec
 
 // expected-error@+1 {{'shader' attribute parameters do not match the previous declaration}}
-[shader("compute")]
+[shader("pixel")]
 // expected-note@+1 {{conflicting attribute is here}}
 [shader("vertex")]
 int doubledUp() {
   return 1;
 }
 
 // expected-note@+1 {{conflicting attribute is here}}
 [shader("vertex")]
 int forwardDecl();
 
 // expected-error@+1 {{'shader' attribute parameters do not match the previous declaration}}
-[shader("compute")]
+[shader("compute"), numthreads(8,1,1)]
 int forwardDecl() {
   return 1;
 }
 
 // expected-error@+1 {{'shader' attribute takes one argument}}
 [shader()]
 // expected-error@+1 {{'shader' attribute takes one argument}}
 [shader(1, 2)]
 // expected-error@+1 {{'shader' attribute requires a string}}
 [shader(1)]
 // expected-warning@+1 {{'shader' attribute argument not supported: cs}}
 [shader("cs")]
 // expected-warning@+1 {{'shader' attribute argument not supported: library}}
 [shader("library")]
 #endif // END of FAIL
 
 // CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:61:2, col:18> Compute
-[shader("compute")]
+[shader("compute"), numthreads(8,1,1)]
 int entry() {
   return 1;
 }
 
 // Because these two attributes match, they should both appear in the AST
-[shader("compute")]
+[shader("compute"), numthreads(8,1,1)]
 // CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:67:2, col:18> Compute
 int secondFn();
 
-[shader("compute")]
+[shader("compute"), numthreads(8,1,1)]
 // CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:71:2, col:18> Compute
 int secondFn() {
   return 1;
 }

clang/test/SemaHLSL/valid-shader-stages.hlsl

+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -o - %s -verify
+
+// expected-no-diagnostics
+
+[shader("pixel")] void pixel();
+[shader("vertex")] void vertex();
+[shader("geometry")] void geometry();
+[shader("hull")] void hull();
+[shader("domain")] void domain();
+[shader("raygeneration")] void raygeneration();
+[shader("intersection")] void intersection();
+[shader("anyhit")] void anyhit();
+[shader("closesthit")] void closesthit();
+[shader("miss")] void miss();
+[shader("callable")] void callable();
+
+[numthreads(1,1,1)][shader("compute")] void compute() {}
+[numthreads(1,1,1)][shader("mesh")] void mesh() {}
+
+#ifndef __DXC_VERSION_MAJOR
+// TODO: These should all come from the implicit header eventually.
+#define inout
+#define in
+struct BuiltInTriangleIntersectionAttributes {
+  float2 barycentrics;
+};
+#endif
+
+typedef BuiltInTriangleIntersectionAttributes Attrs;
+struct Payload {
+  float4 color;
+};
+
+[shader("raygeneration")] void raygeneration() {}
+[shader("closesthit")] void closesthit(inout Payload payload, in Attrs attr) {}
+[shader("anyhit")] void anyhit(inout Payload payload, in Attrs attr) {}
+[shader("miss")] void miss(inout Payload payload) {}