Update flags to match documentation in DXC

Author: Icohedron

llvm/include/llvm/BinaryFormat/DXContainerConstants.def

@@ -21,34 +21,36 @@ SHADER_FEATURE_FLAG(1,  17, ComputeShadersPlusRawAndStructuredBuffers, "CS4 raw
 SHADER_FEATURE_FLAG(2,  16, UAVsAtEveryStage, "UAVs at every shader stage")
 SHADER_FEATURE_FLAG(3,  15, Max64UAVs, "64 UAV slots")
 SHADER_FEATURE_FLAG(4,  -1, MinimumPrecision, "Minimum-precision data types")
-SHADER_FEATURE_FLAG(5,   6, DX11_1_DoubleExtensions, "Double-precision extensions for 11.1")
-SHADER_FEATURE_FLAG(6,   7, DX11_1_ShaderExtensions, "Shader extensions for 11.1")
+SHADER_FEATURE_FLAG(5,   6, DoubleExtensions, "Double-precision extensions")
+SHADER_FEATURE_FLAG(6,   7, EnableMSAD, "Masked sum of absolute differences")
 SHADER_FEATURE_FLAG(7,  14, LEVEL9ComparisonFiltering, "Comparison filtering for feature level 9")
 SHADER_FEATURE_FLAG(8,  12, TiledResources, "Tiled resources")
-SHADER_FEATURE_FLAG(9,  11, StencilRef, "PS Output Stencil Ref")
-SHADER_FEATURE_FLAG(10, 10, InnerCoverage, "PS Inner Coverage")
-SHADER_FEATURE_FLAG(11, 13, TypedUAVLoadAdditionalFormats, "Typed UAV Load Additional Formats")
-SHADER_FEATURE_FLAG(12, 18, ROVs, "Raster Ordered UAVs")
-SHADER_FEATURE_FLAG(13,  9, ViewportAndRTArrayIndexFromAnyShaderFeedingRasterizer, "SV_RenderTargetArrayIndex or SV_ViewportArrayIndex from any shader feeding rasterizer")
-SHADER_FEATURE_FLAG(14, 19, WaveOps, "Wave level operations")
-SHADER_FEATURE_FLAG(15, 20, Int64Ops, "64-Bit integer")
-SHADER_FEATURE_FLAG(16, 21, ViewID, "View Instancing")
+SHADER_FEATURE_FLAG(9,  11, StencilRef, "Stencil reference value")
+SHADER_FEATURE_FLAG(10, 10, InnerCoverage, "Inner coverage")
+SHADER_FEATURE_FLAG(11, 13, TypedUAVLoadAdditionalFormats, "Typed UAV load additional formats")
+SHADER_FEATURE_FLAG(12, 18, ROVs, "Rasterizer order views")
+SHADER_FEATURE_FLAG(13,  9, ViewportAndRTArrayIndexFromAnyShaderFeedingRasterizer, "View port or render target array index from any shader feeding rasterizer")
+SHADER_FEATURE_FLAG(14, 19, WaveOps, "Wave-level operations")
+SHADER_FEATURE_FLAG(15, 20, Int64Ops, "64-bit integers")
+SHADER_FEATURE_FLAG(16, 21, ViewID, "View instancing")
 SHADER_FEATURE_FLAG(17, 22, Barycentrics, "Barycentrics")
-SHADER_FEATURE_FLAG(18, -1, NativeLowPrecision, "Use native low precision")
-SHADER_FEATURE_FLAG(19, 24, ShadingRate, "Shading Rate")
+SHADER_FEATURE_FLAG(18, -1, NativeLowPrecision, "Use native low-precision data types")
+SHADER_FEATURE_FLAG(19, 24, ShadingRate, "Variable-rate shading")
 SHADER_FEATURE_FLAG(20, 25, Raytracing_Tier_1_1, "Raytracing tier 1.1 features")
 SHADER_FEATURE_FLAG(21, 26, SamplerFeedback, "Sampler feedback")
-SHADER_FEATURE_FLAG(22, 27, AtomicInt64OnTypedResource, "64-bit Atomics on Typed Resources")
-SHADER_FEATURE_FLAG(23, 28, AtomicInt64OnGroupShared, "64-bit Atomics on Group Shared")
+SHADER_FEATURE_FLAG(22, 27, AtomicInt64OnTypedResource, "64-bit integer atomics on typed resources")
+SHADER_FEATURE_FLAG(23, 28, AtomicInt64OnGroupShared, "64-bit integer atomics on group shared")
 SHADER_FEATURE_FLAG(24, 29, DerivativesInMeshAndAmpShaders, "Derivatives in mesh and amplification shaders")
 SHADER_FEATURE_FLAG(25, 30, ResourceDescriptorHeapIndexing, "Resource descriptor heap indexing")
 SHADER_FEATURE_FLAG(26, 31, SamplerDescriptorHeapIndexing, "Sampler descriptor heap indexing")
-SHADER_FEATURE_FLAG(27, 63, RESERVED, "<RESERVED>")
-SHADER_FEATURE_FLAG(28, 32, AtomicInt64OnHeapResource, "64-bit Atomics on Heap Resources")
-SHADER_FEATURE_FLAG(29, 34, AdvancedTextureOps, "Advanced Texture Ops")
-SHADER_FEATURE_FLAG(30, 35, WriteableMSAATextures, "Writeable MSAA Textures")
+SHADER_FEATURE_FLAG(27, 36, RESERVED, "<RESERVED>")
+SHADER_FEATURE_FLAG(28, 32, AtomicInt64OnHeapResource, "64-bit integer atomics on descriptor heap resources")
+SHADER_FEATURE_FLAG(29, 34, AdvancedTextureOps, "Advanced texture operations")
+SHADER_FEATURE_FLAG(30, 35, WriteableMSAATextures, "Writeable MSAA textures")
+SHADER_FEATURE_FLAG(31, 37, ExtendedComparisonSampling, "Expanded comparison sampling")
+SHADER_FEATURE_FLAG(32, 38, ExtendedCommandInfo, "Extended command information")
 
-SHADER_FEATURE_FLAG(31, 36, NextUnusedBit, "Next reserved shader flag bit (not a flag)")
+SHADER_FEATURE_FLAG(33, 39, NextUnusedBit, "Next reserved shader flag bit (not a flag)")
 
 #undef SHADER_FEATURE_FLAG
 #endif // SHADER_FEATURE_FLAG
@@ -81,8 +83,8 @@ DXIL_MODULE_FLAG( 1,  DisableMathRefactoring, "Disable math refactoring")
 DXIL_MODULE_FLAG( 3,  ForceEarlyDepthStencil, "Force early depth-stencil test")
 DXIL_MODULE_FLAG( 4,  EnableRawAndStructuredBuffers, "Raw and structured buffers")
 DXIL_MODULE_FLAG( 5,  LowPrecisionPresent, "Low-precision data types")
-DXIL_MODULE_FLAG( 8,  AllResourcesBound, "All resources bound")
-DXIL_MODULE_FLAG(23,  UseNativeLowPrecision, "Native 16-bit types enabled")
+DXIL_MODULE_FLAG( 8,  AllResourcesBound, "All resources bound for the duration of shader execution")
+DXIL_MODULE_FLAG(23,  UseNativeLowPrecision, "Use native low-precision data types")
 DXIL_MODULE_FLAG(33,  ResMayNotAlias, "Any UAV may not alias any other UAV")
 
 #undef DXIL_MODULE_FLAG

llvm/lib/Target/DirectX/DXILShaderFlags.cpp

@@ -94,7 +94,7 @@ void ModuleShaderFlags::updateFunctionFlags(ComputedShaderFlags &CSF,
     case Instruction::SIToFP:
     case Instruction::FPToUI:
     case Instruction::FPToSI:
-      CSF.DX11_1_DoubleExtensions = true;
+      CSF.DoubleExtensions = true;
       break;
     }
   }
@@ -154,7 +154,7 @@ void ModuleShaderFlags::updateFunctionFlags(ComputedShaderFlags &CSF,
     if (FunctionFlags.contains(CF))
       CSF.merge(FunctionFlags[CF]);
 
-    // TODO: Set DX11_1_DoubleExtensions if I is a call to DXIL intrinsic
+    // TODO: Set DoubleExtensions if I is a call to DXIL intrinsic
     // DXIL::Opcode::Fma https://github.com/llvm/llvm-project/issues/114554
 
     CSF.WaveOps |= checkWaveOps(CI->getIntrinsicID());

llvm/test/CodeGen/DirectX/ShaderFlags/double-extensions-obj-test.ll

@@ -12,5 +12,5 @@ attributes #0 = { convergent norecurse nounwind "hlsl.export"}
 ; CHECK-NEXT:     Size:            8
 ; CHECK-NEXT:     Flags:
 ; CHECK:       Doubles:         true
-; CHECK:       DX11_1_DoubleExtensions:         true
+; CHECK:       DoubleExtensions:         true
 

llvm/test/CodeGen/DirectX/ShaderFlags/double-extensions.ll

@@ -7,8 +7,8 @@ target triple = "dxil-pc-shadermodel6.7-library"
 
 ; CHECK: ; Note: shader requires additional functionality:
 ; CHECK-NEXT: ;       Double-precision floating point
-; CHECK-NEXT: ;       Double-precision extensions for 11.1
-; CHECK-NEXT: ;       64-Bit integer
+; CHECK-NEXT: ;       Double-precision extensions
+; CHECK-NEXT: ;       64-bit integer
 ; CHECK-NEXT: ; Note: extra DXIL module flags:
 ; CHECK-NEXT: ;
 ; CHECK-NEXT: ; Shader Flags for Module Functions

llvm/test/CodeGen/DirectX/ShaderFlags/int64ops.ll

@@ -7,7 +7,7 @@ target triple = "dxil-pc-shadermodel6.7-library"
 ;CHECK-NEXT: ; Shader Flags Value: 0x00100000
 ;CHECK-NEXT: ;
 ;CHECK-NEXT: ; Note: shader requires additional functionality:
-;CHECK-NEXT: ;       64-Bit integer
+;CHECK-NEXT: ;       64-bit integer
 ;CHECK-NEXT: ; Note: extra DXIL module flags:
 ;CHECK-NEXT: ;
 ;CHECK-NEXT: ; Shader Flags for Module Functions

llvm/test/CodeGen/DirectX/ShaderFlags/propagate-function-flags-test.ll

@@ -7,8 +7,8 @@ target triple = "dxil-pc-shadermodel6.7-library"
 ; CHECK-NEXT: ;
 ; CHECK-NEXT: ; Note: shader requires additional functionality:
 ; CHECK-NEXT: ;       Double-precision floating point
-; CHECK-NEXT: ;       Double-precision extensions for 11.1
-; CHECK-NEXT: ;       64-Bit integer
+; CHECK-NEXT: ;       Double-precision extensions
+; CHECK-NEXT: ;       64-bit integer
 ; CHECK-NEXT: ; Note: extra DXIL module flags:
 ; CHECK-NEXT: ;
 ; CHECK-NEXT: ; Shader Flags for Module Functions

llvm/test/CodeGen/DirectX/ShaderFlags/typed-uav-load-additional-formats.ll

@@ -11,7 +11,7 @@ target triple = "dxil-pc-shadermodel6.7-library"
 ; CHECK-NEXT: Shader Flags Value: 0x00002000
 
 ; CHECK: Note: shader requires additional functionality:
-; CHECK:       Typed UAV Load Additional Formats
+; CHECK:       Typed UAV load additional formats
 
 ; CHECK: Function multicomponent : 0x00002000
 define <4 x float> @multicomponent() #0 {

llvm/test/CodeGen/DirectX/ShaderFlags/wave-ops.ll

@@ -5,7 +5,7 @@
 ;
 ; CHECK: ; Shader Flags Value: [[WAVE_FLAG:0x00080000]]
 ; CHECK: ; Note: shader requires additional functionality:
-; CHECK-NEXT: ;       Wave level operations
+; CHECK-NEXT: ;       Wave-level operations
 ; CHECK-NEXT: ; Note: extra DXIL module flags:
 
 target triple = "dxil-pc-shadermodel6.7-library"