Merge unroll into unroll-devshFixes

AnastaZIuk · AnastaZIuk · commit 8466c63aaf8f · 2026-03-22T21:36:18.000+01:00
# Conflicts:
#	tools/clang/lib/SPIRV/SpirvEmitter.cpp
#	tools/clang/test/CodeGenSPIRV/cast.flat-conversion.matrix.hlsl
diff --git a/tools/clang/lib/Frontend/Rewrite/RewriteObjC.cpp b/tools/clang/lib/Frontend/Rewrite/RewriteObjC.cpp
@@ -483,7 +483,7 @@ namespace {
         result =  Context->getObjCIdType();
       FunctionProtoType::ExtProtoInfo fpi;
       fpi.Variadic = variadic;
-      return Context->getFunctionType(result, args, fpi);
+      return Context->getFunctionType(result, args, fpi, {});
     }
 
     // Helper function: create a CStyleCastExpr with trivial type source info.
diff --git a/tools/clang/lib/SPIRV/SpirvEmitter.cpp b/tools/clang/lib/SPIRV/SpirvEmitter.cpp
@@ -8077,7 +8077,7 @@ SpirvInstruction *SpirvEmitter::createVectorSplat(const Expr *scalarExpr,
   // Should find a more meaningful one.
   if (auto *constVal = dyn_cast<SpirvConstant>(scalarVal)) {
     llvm::SmallVector<SpirvConstant *, 4> elements(size_t(size), constVal);
-    const bool isSpecConst = constVal->getopcode() == spv::Op::OpSpecConstant;
+    const bool isSpecConst = constVal->isSpecConstant();
     auto *value =
         spvBuilder.getConstantComposite(vecType, elements, isSpecConst);
     if (!value)
@@ -16697,9 +16697,15 @@ bool SpirvEmitter::spirvToolsLegalize(std::vector<uint32_t> *mod,
     optimizer.RegisterPass(
         spvtools::CreateInterfaceVariableScalarReplacementPass());
   }
-  optimizer.RegisterLegalizationPasses(spirvOptions.preserveInterface,
-                                       needsLegalizationLoopUnroll,
-                                       needsLegalizationSsaRewrite);
+  auto legalizationSsaRewriteMode = spvtools::SSARewriteMode::None;
+  if (needsLegalizationLoopUnroll) {
+    legalizationSsaRewriteMode = spvtools::SSARewriteMode::All;
+  } else if (needsLegalizationSsaRewrite) {
+    legalizationSsaRewriteMode = spvtools::SSARewriteMode::OpaqueOnly;
+  }
+  optimizer.RegisterLegalizationPasses(
+      spirvOptions.preserveInterface, needsLegalizationLoopUnroll,
+      legalizationSsaRewriteMode);
   // Add flattening of resources if needed.
   if (spirvOptions.flattenResourceArrays) {
     optimizer.RegisterPass(
diff --git a/tools/clang/test/CodeGenSPIRV/cast.flat-conversion.matrix.hlsl b/tools/clang/test/CodeGenSPIRV/cast.flat-conversion.matrix.hlsl
@@ -21,10 +21,13 @@ RWStructuredBuffer<T> t_output;
 // stored in both cases is the same because the decoration, which is checked
 // above, is what determines the layout in memory for the value.
 
-// CHECK: [[row0:%[0-9]+]] = OpConstantComposite %v3float %float_0 %float_1 %float_2
-// CHECK: [[row1:%[0-9]+]] = OpConstantComposite %v3float %float_3 %float_4 %float_5
-// CHECK: [[mat:%[0-9]+]] = OpConstantComposite %mat2v3float %33 %34
-// CHECK: [[s:%[0-9]+]] = OpConstantComposite %S %35
+// CHECK: [[mat:%[0-9]+]] = OpLoad %mat2v3float
+// CHECK: [[e00:%[0-9]+]] = OpCompositeExtract %float [[mat]] 0 0
+// CHECK: [[e01:%[0-9]+]] = OpCompositeExtract %float [[mat]] 0 1
+// CHECK: [[e02:%[0-9]+]] = OpCompositeExtract %float [[mat]] 0 2
+// CHECK: [[e10:%[0-9]+]] = OpCompositeExtract %float [[mat]] 1 0
+// CHECK: [[e11:%[0-9]+]] = OpCompositeExtract %float [[mat]] 1 1
+// CHECK: [[e12:%[0-9]+]] = OpCompositeExtract %float [[mat]] 1 2
 
 void main() {
   S s;
@@ -36,14 +39,14 @@ void main() {
     }
   }
 // CHECK: [[tptr:%[0-9]+]] = OpAccessChain %_ptr_Uniform_T %t_output %int_0 %uint_0
-// CHECK: [[tarr:%[0-9]+]] = OpCompositeConstruct %_arr_float_uint_6
+// CHECK: [[tarr:%[0-9]+]] = OpCompositeConstruct %_arr_float_uint_6 [[e00]] [[e01]] [[e02]] [[e10]] [[e11]] [[e12]]
 // CHECK: [[tval:%[0-9]+]] = OpCompositeConstruct %T [[tarr]]
 // CHECK: OpStore [[tptr]] [[tval]]
   T t = (T)(s);
   t_output[0] = t;
 
 // CHECK: [[sptr:%[0-9]+]] = OpAccessChain %_ptr_Uniform_S %s_output %int_0 %uint_0
-// CHECK: [[sval:%[0-9]+]] = OpCompositeConstruct %S
+// CHECK: [[sval:%[0-9]+]] = OpCompositeConstruct %S [[mat]]
 // CHECK: OpStore [[sptr]] [[sval]]
   s = (S)t;
   s_output[0] = s;
diff --git a/tools/clang/test/CodeGenSPIRV/type.rwstructured-buffer.array.counter.indirect.hlsl b/tools/clang/test/CodeGenSPIRV/type.rwstructured-buffer.array.counter.indirect.hlsl
@@ -20,11 +20,13 @@ void func(RWStructuredBuffer<uint> local) {
 
 float4 main(PSInput input) : SV_TARGET
 {
-// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int %counter_var_g_rwbuffer {{%[0-9]+}} %uint_0
+// CHECK: [[counter_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_ACSBuffer_counter %counter_var_g_rwbuffer {{%[0-9]+}}
+// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int [[counter_struct]] %uint_0
 // CHECK: OpAtomicIAdd %int [[ac2]] %uint_1 %uint_0 %int_1
     func(g_rwbuffer[input.idx]);
 
-// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint %g_rwbuffer {{%[0-9]+}} %int_0 %uint_0
+// CHECK: [[rwbuffer_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_RWStructuredBuffer_uint %g_rwbuffer {{%[0-9]+}}
+// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint [[rwbuffer_struct]] %int_0 %uint_0
 // CHECK: OpLoad %uint [[ac2_0]]
     return g_rwbuffer[input.idx][0];
 }
diff --git a/tools/clang/test/CodeGenSPIRV/type.rwstructured-buffer.array.counter.indirect2.hlsl b/tools/clang/test/CodeGenSPIRV/type.rwstructured-buffer.array.counter.indirect2.hlsl
@@ -18,11 +18,13 @@ float4 main(PSInput input) : SV_TARGET
 {
     RWStructuredBuffer<uint> l_rwbuffer[5] = g_rwbuffer;
 
-// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int %counter_var_g_rwbuffer %int_0 %uint_0
+// CHECK: [[counter_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_ACSBuffer_counter %counter_var_g_rwbuffer %int_0
+// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int [[counter_struct]] %uint_0
 // CHECK: OpAtomicIAdd %int [[ac2]] %uint_1 %uint_0 %int_1
     l_rwbuffer[0].IncrementCounter();
 
-// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint %g_rwbuffer {{%[0-9]+}} %int_0 %uint_0
+// CHECK: [[rwbuffer_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_RWStructuredBuffer_uint %g_rwbuffer {{%[0-9]+}}
+// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint [[rwbuffer_struct]] %int_0 %uint_0
 // CHECK: OpLoad %uint [[ac2_0]]
     return l_rwbuffer[input.idx][0];
 }
diff --git a/tools/clang/test/CodeGenSPIRV/vk.binding.global-struct-of-resources.optimized.hlsl b/tools/clang/test/CodeGenSPIRV/vk.binding.global-struct-of-resources.optimized.hlsl
@@ -3,20 +3,20 @@
 // Check the names
 //
 // CHECK: OpName %secondGlobal_t "secondGlobal.t"
-// CHECK: OpName %[[fg0:firstGlobal_[0-9]+__t]] "firstGlobal{{.*}}.t"
-// CHECK: OpName %[[fg1:firstGlobal_[0-9]+__t]] "firstGlobal{{.*}}.t"
-// CHECK: OpName %[[fg2:firstGlobal_[0-9]+__t]] "firstGlobal{{.*}}.t"
-// CHECK: OpName %[[fg3:firstGlobal_[0-9]+__t]] "firstGlobal{{.*}}.t"
+// CHECK: OpName %[[fg0:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.t"
+// CHECK: OpName %[[fg1:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.t"
+// CHECK: OpName %[[fg2:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.t"
+// CHECK: OpName %[[fg3:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.t"
 // CHECK: OpName %secondGlobal_tt_0__s "secondGlobal.tt[0].s"
 // CHECK: OpName %secondGlobal_tt_1__s "secondGlobal.tt[1].s"
-// CHECK: OpName %[[fgtt0_0:firstGlobal_[0-9]+__tt_0__s]] "firstGlobal{{.*}}.tt[0].s"
-// CHECK: OpName %[[fgtt0_1:firstGlobal_[0-9]+__tt_1__s]] "firstGlobal{{.*}}.tt[1].s"
-// CHECK: OpName %[[fgtt1_0:firstGlobal_[0-9]+__tt_0__s]] "firstGlobal{{.*}}.tt[0].s"
-// CHECK: OpName %[[fgtt1_1:firstGlobal_[0-9]+__tt_1__s]] "firstGlobal{{.*}}.tt[1].s"
-// CHECK: OpName %[[fgtt2_0:firstGlobal_[0-9]+__tt_0__s]] "firstGlobal{{.*}}.tt[0].s"
-// CHECK: OpName %[[fgtt2_1:firstGlobal_[0-9]+__tt_1__s]] "firstGlobal{{.*}}.tt[1].s"
-// CHECK: OpName %[[fgtt3_0:firstGlobal_[0-9]+__tt_0__s]] "firstGlobal{{.*}}.tt[0].s"
-// CHECK: OpName %[[fgtt3_1:firstGlobal_[0-9]+__tt_1__s]] "firstGlobal{{.*}}.tt[1].s"
+// CHECK: OpName %[[fgtt0_0:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[0].s"
+// CHECK: OpName %[[fgtt0_1:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[1].s"
+// CHECK: OpName %[[fgtt1_0:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[0].s"
+// CHECK: OpName %[[fgtt1_1:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[1].s"
+// CHECK: OpName %[[fgtt2_0:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[0].s"
+// CHECK: OpName %[[fgtt2_1:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[1].s"
+// CHECK: OpName %[[fgtt3_0:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[0].s"
+// CHECK: OpName %[[fgtt3_1:[0-9A-Za-z_]+]] "firstGlobal{{.*}}.tt[1].s"
 
 // Check flattening of bindings
 // Explanation: Only the resources that are used will have a binding assignment
diff --git a/tools/clang/test/CodeGenSPIRV/vk.spec-constant.reuse.hlsl b/tools/clang/test/CodeGenSPIRV/vk.spec-constant.reuse.hlsl
@@ -5,6 +5,6 @@
 
 [shader("pixel")]
 float4 main(float4 position : SV_Position) : SV_Target0 {
-// CHECK: OpConstantComposite %v4bool %y %y %y %y
+// CHECK: OpSpecConstantComposite %v4bool %y %y %y %y
     return y ? position : 1.0;
 }

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ namespace {`
`483`	`483`	`result = Context->getObjCIdType();`
`484`	`484`	`FunctionProtoType::ExtProtoInfo fpi;`
`485`	`485`	`fpi.Variadic = variadic;`
`486`		`- return Context->getFunctionType(result, args, fpi);`
	`486`	`+ return Context->getFunctionType(result, args, fpi, {});`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`// Helper function: create a CStyleCastExpr with trivial type source info.`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,13 @@ void func(RWStructuredBuffer<uint> local) {`
`20`	`20`
`21`	`21`	`float4 main(PSInput input) : SV_TARGET`
`22`	`22`	`{`
`23`		`-// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int %counter_var_g_rwbuffer {{%[0-9]+}} %uint_0`
	`23`	`+// CHECK: [[counter_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_ACSBuffer_counter %counter_var_g_rwbuffer {{%[0-9]+}}`
	`24`	`+// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int [[counter_struct]] %uint_0`
`24`	`25`	`// CHECK: OpAtomicIAdd %int [[ac2]] %uint_1 %uint_0 %int_1`
`25`	`26`	`func(g_rwbuffer[input.idx]);`
`26`	`27`
`27`		`-// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint %g_rwbuffer {{%[0-9]+}} %int_0 %uint_0`
	`28`	`+// CHECK: [[rwbuffer_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_RWStructuredBuffer_uint %g_rwbuffer {{%[0-9]+}}`
	`29`	`+// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint [[rwbuffer_struct]] %int_0 %uint_0`
`28`	`30`	`// CHECK: OpLoad %uint [[ac2_0]]`
`29`	`31`	`return g_rwbuffer[input.idx][0];`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,13 @@ float4 main(PSInput input) : SV_TARGET`
`18`	`18`	`{`
`19`	`19`	`RWStructuredBuffer<uint> l_rwbuffer[5] = g_rwbuffer;`
`20`	`20`
`21`		`-// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int %counter_var_g_rwbuffer %int_0 %uint_0`
	`21`	`+// CHECK: [[counter_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_ACSBuffer_counter %counter_var_g_rwbuffer %int_0`
	`22`	`+// CHECK: [[ac2:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int [[counter_struct]] %uint_0`
`22`	`23`	`// CHECK: OpAtomicIAdd %int [[ac2]] %uint_1 %uint_0 %int_1`
`23`	`24`	`l_rwbuffer[0].IncrementCounter();`
`24`	`25`
`25`		`-// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint %g_rwbuffer {{%[0-9]+}} %int_0 %uint_0`
	`26`	`+// CHECK: [[rwbuffer_struct:%[0-9]+]] = OpAccessChain %_ptr_Uniform_type_RWStructuredBuffer_uint %g_rwbuffer {{%[0-9]+}}`
	`27`	`+// CHECK: [[ac2_0:%[0-9]+]] = OpAccessChain %_ptr_Uniform_uint [[rwbuffer_struct]] %int_0 %uint_0`
`26`	`28`	`// CHECK: OpLoad %uint [[ac2_0]]`
`27`	`29`	`return l_rwbuffer[input.idx][0];`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`
`6`	`6`	`[shader("pixel")]`
`7`	`7`	`float4 main(float4 position : SV_Position) : SV_Target0 {`
`8`		`-// CHECK: OpConstantComposite %v4bool %y %y %y %y`
	`8`	`+// CHECK: OpSpecConstantComposite %v4bool %y %y %y %y`
`9`	`9`	`return y ? position : 1.0;`
`10`	`10`	`}`