Restrict shader models accepted by DxCompiler API to 6.0 (#15)

  - upconvert to 6.0 in dxc.exe and d3dcompiler_dxc_bridge
  - restrict to 6.0 in dxcompiler API
  - restrict to 6.0 in DxilValidator
  - allow loading of SM < 6.0 for now on DXIL 0.7

lib/HLSL/DxilValidation.cpp

@@ -2690,7 +2690,8 @@ static void ValidateMetadata(ValidationContext &ValCtx) {
     }
   }
 
-  if (!ValCtx.DxilMod.GetShaderModel()->IsValid()) {
+  const hlsl::ShaderModel *SM = ValCtx.DxilMod.GetShaderModel();
+  if (!SM->IsValid() || SM->GetMajor() != 6 || SM->GetMinor() != 0) {
     ValCtx.EmitFormatError(ValidationRule::SmName,
                            {ValCtx.DxilMod.GetShaderModel()->GetName()});
   }

tools/clang/lib/CodeGen/CGHLSLMS.cpp

@@ -270,7 +270,8 @@ CGMSHLSLRuntime::CGMSHLSLRuntime(CodeGenModule &CGM)
           llvm::StructType::create(TheModule.getContext(), "ConstantBuffer")) {
   const hlsl::ShaderModel *SM =
       hlsl::ShaderModel::GetByName(CGM.getCodeGenOpts().HLSLProfile.c_str());
-  if (!SM->IsValid()) {
+  // Only accept valid, 6.0 shader model.
+  if (!SM->IsValid() || SM->GetMajor() != 6 || SM->GetMinor() != 0) {
     DiagnosticsEngine &Diags = CGM.getDiags();
     unsigned DiagID =
         Diags.getCustomDiagID(DiagnosticsEngine::Error, "invalid profile %0");

tools/clang/test/CodeGenHLSL/BasicHLSL11_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_0 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: TEXCOORD
 // CHECK: xy

tools/clang/test/CodeGenHLSL/BasicHLSL11_PS2.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_0 -Zi /Od %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 -Zi /Od %s | FileCheck %s
 
 // CHECK: DepthOutput=0
 // CHECK: SampleFrequency=1

tools/clang/test/CodeGenHLSL/BasicHLSL11_PS3.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_0 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: ; PS_INII                  0   xyzw        0     NONE   float
 // CHECK: ; PS_INII                  1   xyzw        1     NONE   float

tools/clang/test/CodeGenHLSL/BasicHLSL11_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_0 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // Skip input
 // CHECK: POSITION

tools/clang/test/CodeGenHLSL/BasicHLSL11_VS2.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_0 -Zpr %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 -Zpr %s | FileCheck %s
 
 // CHECK: OutputPositionPresent=1
 // CHECK: row_major

tools/clang/test/CodeGenHLSL/FloatMaxtessfactorHs.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T hs_5_0 %s | FileCheck %s
+// RUN: %dxc -E main -T hs_6_0 %s | FileCheck %s
 
 // CHECK: float 3.000000e+00}
 

tools/clang/test/CodeGenHLSL/Include.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_0 -Vi -I inc %s | StdErrCheck %s
+// RUN: %dxc -E main -T ps_6_0 -Vi -I inc %s | StdErrCheck %s
 
 
 

tools/clang/test/CodeGenHLSL/NonUniform.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_0 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: createHandle
 // CHECK: i1 true)

tools/clang/test/CodeGenHLSL/RValSubscript.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_0 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // For b4[2]
 // CHECK: cbufferLoadLegacy

tools/clang/test/CodeGenHLSL/Samples/DX11/2DQuadShaders_BlurX_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: dx.op.sample
 // CHECK: dx.op.sample

tools/clang/test/CodeGenHLSL/Samples/DX11/2DQuadShaders_BlurY_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: dx.op.sample
 // CHECK: dx.op.sample

tools/clang/test/CodeGenHLSL/Samples/DX11/2DQuadShaders_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: loadInput
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/BC6HDecode.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/BC6HEncode_EncodeBlockCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // check input.
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/BC6HEncode_TryModeG10CS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // check input.
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/BC6HEncode_TryModeLE10CS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // check input.
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/BC7Decode.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: groupId

tools/clang/test/CodeGenHLSL/Samples/DX11/BC7Encode_EncodeBlockCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: groupId

tools/clang/test/CodeGenHLSL/Samples/DX11/BC7Encode_TryMode02CS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: groupId

tools/clang/test/CodeGenHLSL/Samples/DX11/BC7Encode_TryMode137CS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: groupId

tools/clang/test/CodeGenHLSL/Samples/DX11/BC7Encode_TryMode456CS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: groupId

tools/clang/test/CodeGenHLSL/Samples/DX11/BrightPassAndHorizFilterCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/ComputeShaderSort11.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/ComputeShaderSort11_MatrixTranspose.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: threadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/ContactHardeningShadows11_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 -O0 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 -O0 %s | FileCheck %s
 
 // CHECK: Round_ni
 // CHECK: textureGather

tools/clang/test/CodeGenHLSL/Samples/DX11/ContactHardeningShadows11_SM_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: loadInput
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/ContactHardeningShadows11_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: dot3

tools/clang/test/CodeGenHLSL/Samples/DX11/DecalTessellation11_DS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ds_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ds_6_0 %s | FileCheck %s
 
 // CHECK: domainLocation
 // CHECK: domainLocation

tools/clang/test/CodeGenHLSL/Samples/DX11/DecalTessellation11_HS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T hs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T hs_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: dot3

tools/clang/test/CodeGenHLSL/Samples/DX11/DecalTessellation11_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: sample

tools/clang/test/CodeGenHLSL/Samples/DX11/DecalTessellation11_TessVS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: loadInput
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/DecalTessellation11_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: loadInput
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/DetailTessellation11_DS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ds_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ds_6_0 %s | FileCheck %s
 
 // CHECK: domainLocation
 // CHECK: domainLocation

tools/clang/test/CodeGenHLSL/Samples/DX11/DetailTessellation11_HS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T hs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T hs_6_0 %s | FileCheck %s
 
 // CHECK: storePatchConstant
 // CHECK: main

tools/clang/test/CodeGenHLSL/Samples/DX11/DetailTessellation11_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: Sqrt

tools/clang/test/CodeGenHLSL/Samples/DX11/DetailTessellation11_TessVS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/DetailTessellation11_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/DumpToTexture.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: bufferLoad
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/FilterCS_Horz.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/FilterCS_Vertical.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/FinalPass_CPU_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: sample

tools/clang/test/CodeGenHLSL/Samples/DX11/FinalPass_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_BuildGridCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_BuildGridIndicesCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_ClearGridIndicesCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferStore

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_DensityCS_Grid.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_DensityCS_Shared.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_DensityCS_Simple.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_ForceCS_Grid.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_ForceCS_Shared.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_ForceCS_Simple.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_IntegrateCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidCS11_RearrangeParticlesCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidRender_GS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T gs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T gs_6_0 %s | FileCheck %s
 
 
 // CHECK: emitStream

tools/clang/test/CodeGenHLSL/Samples/DX11/FluidRender_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: bufferLoad
 // CHECK: Saturate

tools/clang/test/CodeGenHLSL/Samples/DX11/NBodyGravityCS11.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: flattenedThreadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/DX11/OIT_CreatePrefixSum_Pass0_CS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: textureLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/OIT_CreatePrefixSum_Pass1_CS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/OIT_FragmentCountPS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: AtomicAdd
 

tools/clang/test/CodeGenHLSL/Samples/DX11/OIT_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: AtomicAdd
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/OIT_SortAndRenderCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: threadId

tools/clang/test/CodeGenHLSL/Samples/DX11/PNTriangles11_DS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ds_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ds_6_0 %s | FileCheck %s
 
 // CHECK: domainLocation
 // CHECK: domainLocation

tools/clang/test/CodeGenHLSL/Samples/DX11/PNTriangles11_HS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T hs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T hs_6_0 %s | FileCheck %s
 
 // CHECK: dot3
 // CHECK: Sqrt

tools/clang/test/CodeGenHLSL/Samples/DX11/PNTriangles11_TessVS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/PNTriangles11_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: FMax

tools/clang/test/CodeGenHLSL/Samples/DX11/POM_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: DerivCoarseX
 // CHECK: DerivCoarseY

tools/clang/test/CodeGenHLSL/Samples/DX11/POM_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/PSApproach_BloomPS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/PSApproach_DownScale2x2_LumPS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: dot4

tools/clang/test/CodeGenHLSL/Samples/DX11/PSApproach_DownScale3x3PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/PSApproach_DownScale3x3_BrightPassPS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: FMax

tools/clang/test/CodeGenHLSL/Samples/DX11/PSApproach_FinalPassPS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: sample

tools/clang/test/CodeGenHLSL/Samples/DX11/ParticleDraw_GS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T gs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T gs_6_0 %s | FileCheck %s
 
 // CHECK: storeOutput
 // CHECK: emitStream

tools/clang/test/CodeGenHLSL/Samples/DX11/ParticleDraw_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: bufferLoad
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/Particle_GS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T gs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T gs_6_0 %s | FileCheck %s
 
 // CHECK: storeOutput
 // CHECK: emitStream

tools/clang/test/CodeGenHLSL/Samples/DX11/Particle_PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: discard

tools/clang/test/CodeGenHLSL/Samples/DX11/Particle_VS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: loadInput
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/ReduceTo1DCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: threadId

tools/clang/test/CodeGenHLSL/Samples/DX11/ReduceToSingleCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: groupId
 // CHECK: threadId

tools/clang/test/CodeGenHLSL/Samples/DX11/RenderVS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: bufferLoad
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/RenderVarianceScenePS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: DerivCoarseX

tools/clang/test/CodeGenHLSL/Samples/DX11/SimpleBezier11DS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ds_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ds_6_0 %s | FileCheck %s
 
 // CHECK: domainLocation
 // CHECK: domainLocation

tools/clang/test/CodeGenHLSL/Samples/DX11/SimpleBezier11HS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T hs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T hs_6_0 %s | FileCheck %s
 
 // CHECK: storePatchConstant
 // CHECK: outputControlPointID

tools/clang/test/CodeGenHLSL/Samples/DX11/SimpleBezier11PS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: Sqrt
 // CHECK: dot3

tools/clang/test/CodeGenHLSL/Samples/DX11/SubD11_BezierEvalDS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ds_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ds_6_0 %s | FileCheck %s
 
 // CHECK: domainLocation
 // CHECK: domainLocation

tools/clang/test/CodeGenHLSL/Samples/DX11/SubD11_MeshSkinningVS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: loadInput
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/SubD11_PatchSkinningVS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: loadInput
 // CHECK: storeOutput

tools/clang/test/CodeGenHLSL/Samples/DX11/SubD11_SmoothPS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T ps_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // CHECK: sample
 // CHECK: dot3

tools/clang/test/CodeGenHLSL/Samples/DX11/SubD11_SubDToBezierHS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T hs_5_1 -O0 %s | FileCheck %s
+// RUN: %dxc -E main -T hs_6_0 -O0 %s | FileCheck %s
 
 // CHECK: primitiveID
 // CHECK: storePatchConstant

tools/clang/test/CodeGenHLSL/Samples/DX11/SubD11_SubDToBezierHS4444.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T hs_5_1 -O0 %s | FileCheck %s
+// RUN: %dxc -E main -T hs_6_0 -O0 %s | FileCheck %s
 
 // CHECK: storePatchConstant
 // CHECK: main

tools/clang/test/CodeGenHLSL/Samples/DX11/TessellatorCS40_EdgeFactorCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/TessellatorCS40_NumVerticesIndicesCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 -O0 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 -O0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/TessellatorCS40_ScatterIDCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/TessellatorCS40_TessellateIndicesCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 -O0 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 -O0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/DX11/TessellatorCS40_TessellateVerticesCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 -O0 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 -O0 %s | FileCheck %s
 
 // CHECK: threadId
 // CHECK: bufferLoad

tools/clang/test/CodeGenHLSL/Samples/MiniEngine/AdaptExposureCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: barrier

tools/clang/test/CodeGenHLSL/Samples/MiniEngine/AoBlurUpsampleBlendOutCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: threadIdInGroup

tools/clang/test/CodeGenHLSL/Samples/MiniEngine/AoBlurUpsampleCS.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T cs_5_1 %s | FileCheck %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
 // CHECK: flattenedThreadIdInGroup
 // CHECK: threadIdInGroup