Add category and shader model to MaybeReorderThread

Author: tex3d

include/dxc/DXIL/DxilConstants.h

@@ -487,35 +487,34 @@ inline bool IsFeedbackTexture(DXIL::ResourceKind ResourceKind) {
 // Enumeration for operations specified by DXIL
 enum class OpCode : unsigned {
   //
-  MaybeReorderThread = 268, // Reorders the current thread
-  Reserved0 = 226,          // Reserved
-  Reserved1 = 227,          // Reserved
-  Reserved10 = 236,         // Reserved
-  Reserved11 = 237,         // Reserved
-  Reserved2 = 228,          // Reserved
-  Reserved3 = 229,          // Reserved
-  Reserved4 = 230,          // Reserved
-  Reserved5 = 231,          // Reserved
-  Reserved6 = 232,          // Reserved
-  Reserved7 = 233,          // Reserved
-  Reserved8 = 234,          // Reserved
-  Reserved9 = 235,          // Reserved
-  ReservedA0 = 259,         // reserved
-  ReservedA1 = 260,         // reserved
-  ReservedA2 = 261,         // reserved
-  ReservedB28 = 290,        // reserved
-  ReservedB29 = 291,        // reserved
-  ReservedB30 = 292,        // reserved
-  ReservedC0 = 293,         // reserved
-  ReservedC1 = 294,         // reserved
-  ReservedC2 = 295,         // reserved
-  ReservedC3 = 296,         // reserved
-  ReservedC4 = 297,         // reserved
-  ReservedC5 = 298,         // reserved
-  ReservedC6 = 299,         // reserved
-  ReservedC7 = 300,         // reserved
-  ReservedC8 = 301,         // reserved
-  ReservedC9 = 302,         // reserved
+  Reserved0 = 226,   // Reserved
+  Reserved1 = 227,   // Reserved
+  Reserved10 = 236,  // Reserved
+  Reserved11 = 237,  // Reserved
+  Reserved2 = 228,   // Reserved
+  Reserved3 = 229,   // Reserved
+  Reserved4 = 230,   // Reserved
+  Reserved5 = 231,   // Reserved
+  Reserved6 = 232,   // Reserved
+  Reserved7 = 233,   // Reserved
+  Reserved8 = 234,   // Reserved
+  Reserved9 = 235,   // Reserved
+  ReservedA0 = 259,  // reserved
+  ReservedA1 = 260,  // reserved
+  ReservedA2 = 261,  // reserved
+  ReservedB28 = 290, // reserved
+  ReservedB29 = 291, // reserved
+  ReservedB30 = 292, // reserved
+  ReservedC0 = 293,  // reserved
+  ReservedC1 = 294,  // reserved
+  ReservedC2 = 295,  // reserved
+  ReservedC3 = 296,  // reserved
+  ReservedC4 = 297,  // reserved
+  ReservedC5 = 298,  // reserved
+  ReservedC6 = 299,  // reserved
+  ReservedC7 = 300,  // reserved
+  ReservedC8 = 301,  // reserved
+  ReservedC9 = 302,  // reserved
 
   // Amplification shader instructions
   DispatchMesh = 173, // Amplification shader intrinsic DispatchMesh
@@ -931,6 +930,7 @@ enum class OpCode : unsigned {
   HitObject_WorldRayOrigin = 275,    // Returns the ray origin in world space
   HitObject_WorldToObject3x4 = 280,  // Returns the world to object space
                                      // transformation matrix in 3x4 form
+  MaybeReorderThread = 268,          // Reorders the current thread
 
   // Synchronization
   AtomicBinOp = 78,           // performs an atomic operation on two operands
@@ -1072,7 +1072,6 @@ enum class OpCode : unsigned {
 // Groups for DXIL operations with equivalent function templates
 enum class OpCodeClass : unsigned {
   //
-  MaybeReorderThread,
   Reserved,
 
   // Amplification shader instructions
@@ -1320,6 +1319,7 @@ enum class OpCodeClass : unsigned {
   HitObject_StateScalar,
   HitObject_StateVector,
   HitObject_TraceRay,
+  MaybeReorderThread,
 
   // Synchronization
   AtomicBinOp,

lib/DXIL/DxilOperations.cpp

@@ -2353,8 +2353,6 @@ const OP::OpCodeProperty OP::m_OpCodeProps[(unsigned)OP::OpCode::NumOpCodes] = {
      1,
      {{0x100}},
      {{0x0}}}, // Overloads: u
-
-    //
     {OC::MaybeReorderThread,
      "MaybeReorderThread",
      OCC::MaybeReorderThread,
@@ -2363,8 +2361,6 @@ const OP::OpCodeProperty OP::m_OpCodeProps[(unsigned)OP::OpCode::NumOpCodes] = {
      0,
      {},
      {}}, // Overloads: v
-
-    // Shader Execution Reordering
     {OC::HitObject_IsMiss,
      "HitObject_IsMiss",
      OCC::HitObject_StateScalar,
@@ -3180,11 +3176,6 @@ void OP::GetMinShaderModelAndMask(OpCode C, bool bWithTranslation,
            SFLAG(Amplification) | SFLAG(Mesh) | SFLAG(Node);
     return;
   }
-  // Instructions: MaybeReorderThread=268
-  if (op == 268) {
-    mask = SFLAG(Library) | SFLAG(RayGeneration);
-    return;
-  }
   // Instructions: RenderTargetGetSamplePosition=76,
   // RenderTargetGetSampleCount=77, Discard=82, EvalSnapped=87,
   // EvalSampleIndex=88, EvalCentroid=89, SampleIndex=90, Coverage=91,
@@ -3455,6 +3446,13 @@ void OP::GetMinShaderModelAndMask(OpCode C, bool bWithTranslation,
     minor = 9;
     return;
   }
+  // Instructions: MaybeReorderThread=268
+  if (op == 268) {
+    major = 6;
+    minor = 9;
+    mask = SFLAG(Library) | SFLAG(RayGeneration);
+    return;
+  }
   // Instructions: HitObject_TraceRay=262, HitObject_FromRayQuery=263,
   // HitObject_FromRayQueryWithAttrs=264, HitObject_MakeMiss=265,
   // HitObject_MakeNop=266, HitObject_Invoke=267, HitObject_IsMiss=269,
@@ -5696,17 +5694,13 @@ Function *OP::GetOpFunc(OpCode opCode, Type *pOverloadType) {
     A(pHit);
     A(udt);
     break;
-
-    //
   case OpCode::MaybeReorderThread:
     A(pV);
     A(pI32);
     A(pHit);
     A(pI32);
     A(pI32);
     break;
-
-    // Shader Execution Reordering
   case OpCode::HitObject_IsMiss:
     A(pI1);
     A(pI32);

utils/hct/hctdb.py

@@ -867,6 +867,8 @@ def populate_categories_and_models(self):
                 "miss",
             )
         for i in ("MaybeReorderThread").split(","):
+            self.name_idx[i].category = "Shader Execution Reordering"
+            self.name_idx[i].shader_model = 6, 9
             self.name_idx[i].shader_stages = (
                 "library",
                 "raygeneration",