Fix mis-named variable that was not edited appropriately after

a copy-paste.

Add necessary function attributes to tests and remove
unnecessary check for mumber of entries for non-library
shaders in createEntryMD()

Author: bharadwajy

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

@@ -242,26 +242,24 @@ static void createEntryMD(Module &M, const uint64_t ShaderFlags,
       // EntryPro.Entry is 0.
       ShaderEntryMDInfo SEP(EntryProp, Ctx, MDAnalysisInfo.ShaderProfile,
                             nullptr, 0);
-      MDTuple *EmptyMDT = SEP.getAsMetadata();
-      EntryFnMDNodes.emplace_back(EmptyMDT);
+      MDTuple *MDT = SEP.getAsMetadata();
+      EntryFnMDNodes.emplace_back(MDT);
     }
   } break;
   case Triple::EnvironmentType::Compute: {
     size_t NumEntries = MDAnalysisInfo.EntryPropertyVec.size();
-    if (NumEntries > 0) {
-      assert(NumEntries == 1 &&
-             "Compute shader: One and only one entry expected");
-      EntryProperties EntryProp = MDAnalysisInfo.EntryPropertyVec[0];
-      // ShaderFlagsAnalysis pass needs to collect and provide ShaderFlags for
-      // each entry function. Currently, even though the ShaderFlags value
-      // provided by ShaderFlagsAnalysis pass is created by walking all the
-      // function instructions of the module, it is sufficient to since there is
-      // only one entry function in the module.
-      ShaderEntryMDInfo SEP(EntryProp, Ctx, MDAnalysisInfo.ShaderProfile,
-                            MDResources, ShaderFlags);
-      MDTuple *EmptyMDT = SEP.getAsMetadata();
-      EntryFnMDNodes.emplace_back(EmptyMDT);
-    }
+    assert(NumEntries == 1 &&
+           "Compute shader: One and only one entry expected");
+    EntryProperties EntryProp = MDAnalysisInfo.EntryPropertyVec[0];
+    // ShaderFlagsAnalysis pass needs to collect and provide ShaderFlags for
+    // each entry function. Currently, even though the ShaderFlags value
+    // provided by ShaderFlagsAnalysis pass is created by walking all the
+    // function instructions of the module, it is sufficient to since there is
+    // only one entry function in the module.
+    ShaderEntryMDInfo SEP(EntryProp, Ctx, MDAnalysisInfo.ShaderProfile,
+                          MDResources, ShaderFlags);
+    MDTuple *MDT = SEP.getAsMetadata();
+    EntryFnMDNodes.emplace_back(MDT);
     break;
   }
   case Triple::EnvironmentType::Amplification:
@@ -272,19 +270,17 @@ static void createEntryMD(Module &M, const uint64_t ShaderFlags,
   case Triple::EnvironmentType::Geometry:
   case Triple::EnvironmentType::Pixel: {
     size_t NumEntries = MDAnalysisInfo.EntryPropertyVec.size();
-    if (NumEntries > 0) {
-      assert(NumEntries == 1 && "non-lib profiles should only have one entry");
-      EntryProperties EntryProp = MDAnalysisInfo.EntryPropertyVec[0];
-      // ShaderFlagsAnalysis pass needs to collect and provide ShaderFlags for
-      // each entry function. Currently, even though the ShaderFlags value
-      // provided by ShaderFlagsAnalysis pass is created by walking all the
-      // function instructions of the module, it is sufficient to since there is
-      // only one entry function in the module.
-      ShaderEntryMDInfo SEP(EntryProp, Ctx, MDAnalysisInfo.ShaderProfile,
-                            MDResources, ShaderFlags);
-      MDTuple *EmptyMDT = SEP.getAsMetadata();
-      EntryFnMDNodes.emplace_back(EmptyMDT);
-    }
+    assert(NumEntries == 1 && "non-lib profiles should only have one entry");
+    EntryProperties EntryProp = MDAnalysisInfo.EntryPropertyVec[0];
+    // ShaderFlagsAnalysis pass needs to collect and provide ShaderFlags for
+    // each entry function. Currently, even though the ShaderFlags value
+    // provided by ShaderFlagsAnalysis pass is created by walking all the
+    // function instructions of the module, it is sufficient to since there is
+    // only one entry function in the module.
+    ShaderEntryMDInfo SEP(EntryProp, Ctx, MDAnalysisInfo.ShaderProfile,
+                          MDResources, ShaderFlags);
+    MDTuple *MDT = SEP.getAsMetadata();
+    EntryFnMDNodes.emplace_back(MDT);
   } break;
   default:
     assert(0 && "invalid profile");

llvm/test/CodeGen/DirectX/CreateHandle.ll

@@ -14,7 +14,7 @@ target triple = "dxil-pc-shadermodel6.0-compute"
 
 declare i32 @some_val();
 
-define void @test_buffers() {
+define void @test_buffers() #0 {
   ; RWBuffer<float4> Buf : register(u5, space3)
   %typed0 = call target("dx.TypedBuffer", <4 x float>, 1, 0, 0)
               @llvm.dx.handle.fromBinding.tdx.TypedBuffer_v4f32_1_0_0(
@@ -68,4 +68,4 @@ define void @test_buffers() {
 ; CHECK-DAG: [[SRVMD]] = !{!{{[0-9]+}}, !{{[0-9]+}}, !{{[0-9]+}}, !{{[0-9]+}}}
 ; CHECK-DAG: [[UAVMD]] = !{!{{[0-9]+}}, !{{[0-9]+}}}
 
-attributes #0 = { nocallback nofree nosync nounwind willreturn memory(none) }
+attributes #0 = { nocallback nofree nosync nounwind willreturn memory(none) "hlsl.numthreads"="1,2,1" "hlsl.shader"="compute"}

llvm/test/CodeGen/DirectX/CreateHandleFromBinding.ll

@@ -14,7 +14,7 @@ target triple = "dxil-pc-shadermodel6.6-compute"
 
 declare i32 @some_val();
 
-define void @test_bindings() {
+define void @test_bindings() #0 {
   ; RWBuffer<float4> Buf : register(u5, space3)
   %typed0 = call target("dx.TypedBuffer", <4 x float>, 1, 0, 0)
               @llvm.dx.handle.fromBinding.tdx.TypedBuffer_v4f32_1_0_0(
@@ -73,4 +73,4 @@ define void @test_bindings() {
 ; CHECK-DAG: [[SRVMD]] = !{!{{[0-9]+}}, !{{[0-9]+}}, !{{[0-9]+}}, !{{[0-9]+}}}
 ; CHECK-DAG: [[UAVMD]] = !{!{{[0-9]+}}, !{{[0-9]+}}}
 
-attributes #0 = { nocallback nofree nosync nounwind willreturn memory(none) }
+attributes #0 = { nocallback nofree nosync nounwind willreturn memory(none) "hlsl.numthreads"="1,2,1" "hlsl.shader"="compute"}