change created block names

Signed-off-by: Nathan Gauër <[email protected]>

Author: Keenuts

llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp

@@ -443,8 +443,8 @@ class SPIRVStructurizer : public FunctionPass {
         if (!Inserted) {
           // Src already a source node. Cannot have 2 edges from A to B.
           // Creating alias source block.
-          BasicBlock *NewSrc =
-              BasicBlock::Create(F.getContext(), "new.src", &F);
+          BasicBlock *NewSrc = BasicBlock::Create(
+              F.getContext(), Src->getName() + ".new.src", &F);
           replaceBranchTargets(Src, Dst, NewSrc);
           IRBuilder<> Builder(NewSrc);
           Builder.CreateBr(Dst);
@@ -473,7 +473,8 @@ class SPIRVStructurizer : public FunctionPass {
 
       std::vector<BasicBlock *> Dsts;
       std::unordered_map<BasicBlock *, ConstantInt *> DstToIndex;
-      auto NewExit = BasicBlock::Create(F.getContext(), "new.exit", &F);
+      auto NewExit = BasicBlock::Create(F.getContext(),
+                                        Header->getName() + ".new.exit", &F);
       IRBuilder<> ExitBuilder(NewExit);
       for (auto &[Src, Dst] : FixedEdges) {
         if (DstToIndex.count(Dst) != 0)

llvm/test/CodeGen/SPIRV/structurizer/logical-or.ll

@@ -5,7 +5,7 @@ target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:
 target triple = "spirv-unknown-vulkan1.3-compute"
 
 define internal spir_func void @main() #3 {
-; CHECK-DAG:   OpName %[[#switch_0:]] "reg2"
+; CHECK-DAG:   OpName %[[#switch_0:]] "reg1"
 ; CHECK-DAG:   OpName %[[#switch_1:]] "reg"
 
 ; CHECK-DAG:   %[[#int_0:]] = OpConstant %[[#]] 0

llvm/test/CodeGen/SPIRV/structurizer/loop-continue-split.ll

@@ -13,7 +13,7 @@
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
 target triple = "spirv-unknown-vulkan1.3-compute"
 
-; CHECK-DAG:    OpName %[[#switch_0:]] "reg2"
+; CHECK-DAG:    OpName %[[#switch_0:]] "reg1"
 ; CHECK-DAG:    OpName %[[#variable:]] "var"
 
 ; CHECK-DAG:    %[[#int_0:]] = OpConstant %[[#]] 0

llvm/test/CodeGen/SPIRV/structurizer/return-early.ll

@@ -1,8 +1,8 @@
 ; RUN: llc -mtriple=spirv-unknown-vulkan-compute -O0 %s -o - | FileCheck %s
 ; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-vulkan-compute %s -o - -filetype=obj | spirv-val %}
 
-; CHECK-DAG:         OpName %[[#reg_0:]] "reg4"
-; CHECK-DAG:         OpName %[[#reg_1:]] "reg2"
+; CHECK-DAG:         OpName %[[#reg_0:]] "reg2"
+; CHECK-DAG:         OpName %[[#reg_1:]] "reg1"
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
 target triple = "spirv-unknown-vulkan1.3-compute"