[llvm] 5fe91f1 - [SLP]Check for catchswitch block before doing the analysis of the instructions
Alexey Bataev via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 17 09:10:25 PDT 2025
Author: Alexey Bataev
Date: 2025-04-17T09:10:15-07:00
New Revision: 5fe91f1b5948591b75416ce529b3179234c8d93d
URL: https://github.com/llvm/llvm-project/commit/5fe91f1b5948591b75416ce529b3179234c8d93d
DIFF: https://github.com/llvm/llvm-project/commit/5fe91f1b5948591b75416ce529b3179234c8d93d.diff
LOG: [SLP]Check for catchswitch block before doing the analysis of the instructions
Need to skip the analysis of the catchswitch blocks to avoid a compiler
crash when trying to get the first instruction in the block.
Added:
llvm/test/Transforms/SLPVectorizer/X86/catchswitch-block-in-use.ll
Modified:
llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index 0cf89ea4a9dc8..d496989cd0581 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -14133,7 +14133,8 @@ InstructionCost BoUpSLP::getSpillCost() {
Budget += BlockSize;
if (Budget > BudgetLimit)
return Res;
- if (!CheckForNonVecCallsInSameBlock(&*BB->getFirstNonPHIOrDbgOrAlloca(),
+ if (!isa<CatchSwitchInst>(BB->getTerminator()) &&
+ !CheckForNonVecCallsInSameBlock(&*BB->getFirstNonPHIOrDbgOrAlloca(),
BB->getTerminator()))
return Res;
Worklist.append(pred_begin(BB), pred_end(BB));
diff --git a/llvm/test/Transforms/SLPVectorizer/X86/catchswitch-block-in-use.ll b/llvm/test/Transforms/SLPVectorizer/X86/catchswitch-block-in-use.ll
new file mode 100644
index 0000000000000..8ecb5af404a72
--- /dev/null
+++ b/llvm/test/Transforms/SLPVectorizer/X86/catchswitch-block-in-use.ll
@@ -0,0 +1,64 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S --passes=slp-vectorizer -mtriple=x86_64-pc-windows-msvc19.40.33811 < %s | FileCheck %s
+
+%"class.boost::execution_exception" = type { i32, %"class.boost::unit_test::basic_cstring", %"struct.boost::execution_exception::location" }
+%"class.boost::unit_test::basic_cstring" = type { ptr, ptr }
+%"struct.boost::execution_exception::location" = type { %"class.boost::unit_test::basic_cstring", i64, %"class.boost::unit_test::basic_cstring" }
+
+define void @test() personality ptr null {
+; CHECK-LABEL: define void @test() personality ptr null {
+; CHECK-NEXT: [[ENTRY:.*]]:
+; CHECK-NEXT: br label %[[FOR_COND109:.*]]
+; CHECK: [[FOR_COND109]]:
+; CHECK-NEXT: [[TMP0:%.*]] = phi <2 x ptr> [ zeroinitializer, %[[ENTRY]] ], [ zeroinitializer, %[[IF_END153:.*]] ]
+; CHECK-NEXT: br label %[[INIT_ATTEMPT_I664:.*]]
+; CHECK: [[INIT_ATTEMPT_I664]]:
+; CHECK-NEXT: [[CALL_I666:%.*]] = invoke ptr null(ptr null)
+; CHECK-NEXT: to label %[[INVOKE_CONT_I668:.*]] unwind label %[[CATCH_DISPATCH:.*]]
+; CHECK: [[INVOKE_CONT_I668]]:
+; CHECK-NEXT: ret void
+; CHECK: [[CATCH_DISPATCH]]:
+; CHECK-NEXT: [[TMP1:%.*]] = catchswitch within none [label %catch] unwind to caller
+; CHECK: [[CATCH:.*]]:
+; CHECK-NEXT: [[TMP2:%.*]] = catchpad within [[TMP1]] [ptr null, i32 0, ptr null]
+; CHECK-NEXT: br i1 false, label %[[IF_END153]], label %[[INVOKE_CONT149:.*]]
+; CHECK: [[INVOKE_CONT149]]:
+; CHECK-NEXT: [[TMP3:%.*]] = load <2 x ptr>, ptr null, align 8
+; CHECK-NEXT: br label %[[IF_END153]]
+; CHECK: [[IF_END153]]:
+; CHECK-NEXT: [[TMP4:%.*]] = phi <2 x ptr> [ [[TMP0]], %[[CATCH]] ], [ [[TMP3]], %[[INVOKE_CONT149]] ]
+; CHECK-NEXT: catchret from [[TMP2]] to label %[[FOR_COND109]]
+;
+entry:
+ br label %for.cond109
+
+for.cond109:
+ %setup_error.sroa.0.1 = phi ptr [ null, %entry ], [ null, %if.end153 ]
+ %setup_error.sroa.6.1 = phi ptr [ null, %entry ], [ null, %if.end153 ]
+ br label %init.attempt.i664
+
+init.attempt.i664:
+ %call.i666 = invoke ptr null(ptr null)
+ to label %invoke.cont.i668 unwind label %catch.dispatch
+
+invoke.cont.i668:
+ ret void
+
+catch.dispatch:
+ %0 = catchswitch within none [label %catch] unwind to caller
+
+catch:
+ %1 = catchpad within %0 [ptr null, i32 0, ptr null]
+ br i1 false, label %if.end153, label %invoke.cont149
+
+invoke.cont149:
+ %m_begin2.i.i = getelementptr %"class.boost::execution_exception", ptr null, i64 0, i32 1, i32 0
+ %2 = load ptr, ptr %m_begin2.i.i, align 8
+ %3 = load ptr, ptr null, align 8
+ br label %if.end153
+
+if.end153:
+ %setup_error.sroa.0.2 = phi ptr [ %setup_error.sroa.0.1, %catch ], [ %2, %invoke.cont149 ]
+ %setup_error.sroa.6.2 = phi ptr [ %setup_error.sroa.6.1, %catch ], [ %3, %invoke.cont149 ]
+ catchret from %1 to label %for.cond109
+}
More information about the llvm-commits
mailing list