[ser] enforce minShaderTarget for REORDER_SCOPE BarrierByMemoryHandle opc

Author: simoll

lib/DXIL/DxilOperations.cpp

@@ -3020,6 +3020,16 @@ bool OP::BarrierRequiresReorder(const llvm::CallInst *CI) {
     }
     return false;
   }
+  case OpCode::BarrierByMemoryHandle: {
+    DxilInst_BarrierByMemoryHandle barrier(const_cast<CallInst *>(CI));
+    if (isa<ConstantInt>(barrier.get_SemanticFlags())) {
+      unsigned semanticFlags = barrier.get_SemanticFlags_val();
+      return (semanticFlags &
+              static_cast<unsigned>(DXIL::BarrierSemanticFlag::ReorderScope)) !=
+             0U;
+    }
+    return false;
+  }
   default:
     return false;
   }

tools/clang/test/HLSLFileCheck/d3dreflect/rdat_mintarget/sm69_barriers.hlsl

@@ -6,87 +6,6 @@
 
 RWByteAddressBuffer BAB : register(u1, space0);
 
-// RDAT-LABEL: UnmangledName: "node_barrier"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: (Opt_RequiresGroup)
-// RDAT: ShaderStageFlag: (Node)
-// RDAT: MinShaderTarget: 0xf0068
-
-[shader("node")]
-[NodeLaunch("broadcasting")]
-[NodeDispatchGrid(1, 1, 1)]
-[NumThreads(1,1,1)]
-void node_barrier() {
-  GroupMemoryBarrierWithGroupSync();
-  BAB.Store(0, 0);
-}
-
-// RDAT-LABEL: UnmangledName: "fn_barrier_device1"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: 0
-// RDAT: ShaderStageFlag: (Pixel | Vertex | Geometry | Hull | Domain | Compute | Library | RayGeneration | Intersection | AnyHit | ClosestHit | Miss | Callable | Mesh | Amplification | Node)
-// RDAT: MinShaderTarget: 0x60060
-
-[noinline] export
-void fn_barrier_device1() {
-  Barrier(UAV_MEMORY, DEVICE_SCOPE);
-}
-
-// RDAT-LABEL: UnmangledName: "fn_barrier_device2"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: 0
-// RDAT: ShaderStageFlag: (Pixel | Vertex | Geometry | Hull | Domain | Compute | Library | RayGeneration | Intersection | AnyHit | ClosestHit | Miss | Callable | Mesh | Amplification | Node)
-// RDAT: MinShaderTarget: 0x60068
-
-[noinline] export
-void fn_barrier_device2() {
-  Barrier(BAB, DEVICE_SCOPE);
-}
-
-// RDAT-LABEL: UnmangledName: "fn_barrier_group1"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: (Opt_RequiresGroup)
-// RDAT: ShaderStageFlag: (Compute | Library | Mesh | Amplification | Node)
-// RDAT: MinShaderTarget: 0x60060
-
-[noinline] export
-void fn_barrier_group1() {
-  Barrier(GROUP_SHARED_MEMORY, GROUP_SYNC | GROUP_SCOPE);
-}
-
-// RDAT-LABEL: UnmangledName: "fn_barrier_group2"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: (Opt_RequiresGroup)
-// RDAT: ShaderStageFlag: (Compute | Library | Mesh | Amplification | Node)
-// RDAT: MinShaderTarget: 0x60068
-
-[noinline] export
-void fn_barrier_group2() {
-  Barrier(BAB, GROUP_SYNC | GROUP_SCOPE);
-}
-
-// RDAT-LABEL: UnmangledName: "fn_barrier_node1"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: 0
-// RDAT: ShaderStageFlag: (Library | Node)
-// RDAT: MinShaderTarget: 0x60068
-
-[noinline] export
-void fn_barrier_node1() {
-  Barrier(NODE_INPUT_MEMORY, DEVICE_SCOPE);
-}
-
-// RDAT-LABEL: UnmangledName: "fn_barrier_node_group1"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: (Opt_RequiresGroup)
-// RDAT: ShaderStageFlag: (Library | Node)
-// RDAT: MinShaderTarget: 0x60068
-
-[noinline] export
-void fn_barrier_node_group1() {
-  Barrier(NODE_INPUT_MEMORY, GROUP_SYNC | GROUP_SCOPE);
-}
-
 // RDAT-LABEL: UnmangledName: "fn_barrier_reorder"
 // RDAT: FeatureInfo1: 0
 // RDAT: FeatureInfo2: 0
@@ -98,59 +17,37 @@ void fn_barrier_reorder() {
   Barrier(UAV_MEMORY, REORDER_SCOPE);
 }
 
-// RDAT-LABEL: UnmangledName: "node_barrier_device_in_call"
+// RDAT-LABEL: UnmangledName: "fn_barrier_reorder2"
 // RDAT: FeatureInfo1: 0
 // RDAT: FeatureInfo2: 0
-// RDAT: ShaderStageFlag: (Node)
-// RDAT: MinShaderTarget: 0xf0068
+// RDAT: ShaderStageFlag: (Library | RayGeneration)
+// RDAT: MinShaderTarget: 0x60069
 
-[shader("node")]
-[NodeLaunch("broadcasting")]
-[NodeDispatchGrid(1, 1, 1)]
-[NumThreads(1,1,1)]
-void node_barrier_device_in_call() {
-  fn_barrier_device1();
-  BAB.Store(0, 0);
+[noinline] export
+void fn_barrier_reorder2() {
+  Barrier(BAB, REORDER_SCOPE);
 }
 
-// RDAT-LABEL: UnmangledName: "node_barrier_node_in_call"
+// RDAT-LABEL: UnmangledName: "rg_barrier_reorder_in_call"
 // RDAT: FeatureInfo1: 0
 // RDAT: FeatureInfo2: 0
-// RDAT: ShaderStageFlag: (Node)
-// RDAT: MinShaderTarget: 0xf0068
-
-[shader("node")]
-[NodeLaunch("broadcasting")]
-[NodeDispatchGrid(1, 1, 1)]
-[NumThreads(1,1,1)]
-void node_barrier_node_in_call() {
-  fn_barrier_node1();
-  BAB.Store(0, 0);
-}
-
-// RDAT-LABEL: UnmangledName: "node_barrier_node_group_in_call"
-// RDAT: FeatureInfo1: 0
-// RDAT: FeatureInfo2: (Opt_RequiresGroup)
-// RDAT: ShaderStageFlag: (Node)
-// RDAT: MinShaderTarget: 0xf0068
+// RDAT: ShaderStageFlag: (RayGeneration)
+// RDAT: MinShaderTarget: 0x70069
 
-[shader("node")]
-[NodeLaunch("broadcasting")]
-[NodeDispatchGrid(1, 1, 1)]
-[NumThreads(1,1,1)]
-void node_barrier_node_group_in_call() {
-  fn_barrier_node_group1();
+[shader("raygeneration")]
+void rg_barrier_reorder_in_call() {
+  fn_barrier_reorder();
   BAB.Store(0, 0);
 }
 
-// RDAT-LABEL: UnmangledName: "rg_barrier_reorder_in_call"
+// RDAT-LABEL: UnmangledName: "rg_barrier_reorder_in_call2"
 // RDAT: FeatureInfo1: 0
 // RDAT: FeatureInfo2: 0
 // RDAT: ShaderStageFlag: (RayGeneration)
 // RDAT: MinShaderTarget: 0x70069
 
 [shader("raygeneration")]
-void rg_barrier_reorder_in_call() {
-  fn_barrier_reorder();
+void rg_barrier_reorder_in_call2() {
+  fn_barrier_reorder2();
   BAB.Store(0, 0);
 }