[llvm] [VPlan] Add scalar inferencing support for Not and Or insns (PR #89160)
Patrick O'Neill via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 18 10:10:21 PDT 2024
https://github.com/patrick-rivos updated https://github.com/llvm/llvm-project/pull/89160
>From 58c3d00af6e6abb8cffc9d624ca6469cbec3b20b Mon Sep 17 00:00:00 2001
From: Patrick O'Neill <patrick at rivosinc.com>
Date: Wed, 17 Apr 2024 17:58:01 -0700
Subject: [PATCH 1/2] [VPlan] Add scalar inferencing support for Not and Or
insns
Fixes #87394.
---
.../Transforms/Vectorize/VPlanAnalysis.cpp | 4 +-
.../LoopVectorize/vplan-infer-not-or-type.ll | 61 +++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
create mode 100644 llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll
diff --git a/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp b/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
index 130fb04f586e75..d38e5d23907174 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
@@ -35,6 +35,7 @@ Type *VPTypeAnalysis::inferScalarTypeForRecipe(const VPInstruction *R) {
CachedTypes[OtherV] = ResTy;
return ResTy;
}
+ case Instruction::Or:
case Instruction::ICmp:
case VPInstruction::FirstOrderRecurrenceSplice: {
Type *ResTy = inferScalarType(R->getOperand(0));
@@ -44,8 +45,9 @@ Type *VPTypeAnalysis::inferScalarTypeForRecipe(const VPInstruction *R) {
CachedTypes[OtherV] = ResTy;
return ResTy;
}
+ case VPInstruction::Not:
case VPInstruction::PtrAdd:
- // Return the type based on the pointer argument (i.e. first operand).
+ // Return the type based on the pointer/not argument (i.e. first operand).
return inferScalarType(R->getOperand(0));
default:
break;
diff --git a/llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll b/llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll
new file mode 100644
index 00000000000000..488269c2eb6155
--- /dev/null
+++ b/llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll
@@ -0,0 +1,61 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 4
+; RUN: opt < %s -passes=loop-vectorize -S | FileCheck %s
+
+; This test used to crash due to missing Or/Not cases in
+; inferScalarTypeForRecipe.
+
+define i32 @foo() {
+; CHECK-LABEL: define i32 @foo() {
+; CHECK-NEXT: entry:
+; CHECK-NEXT: br i1 false, label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
+; CHECK: vector.ph:
+; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
+; CHECK: vector.body:
+; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
+; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 2
+; CHECK-NEXT: br i1 true, label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
+; CHECK: middle.block:
+; CHECK-NEXT: br i1 true, label [[FOR_COND_CLEANUP_LOOPEXIT:%.*]], label [[SCALAR_PH]]
+; CHECK: scalar.ph:
+; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ 2, [[MIDDLE_BLOCK]] ], [ 0, [[ENTRY:%.*]] ]
+; CHECK-NEXT: br label [[FOR_BODY:%.*]]
+; CHECK: for.cond.cleanup.loopexit:
+; CHECK-NEXT: ret i32 0
+; CHECK: for.body:
+; CHECK-NEXT: [[INDVARS_IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ], [ [[INDVARS_IV_NEXT:%.*]], [[COND_END:%.*]] ]
+; CHECK-NEXT: [[ZEXT_0:%.*]] = zext i1 false to i64
+; CHECK-NEXT: [[DEAD_INSN:%.*]] = trunc i64 [[ZEXT_0]] to i16
+; CHECK-NEXT: br i1 false, label [[COND_FALSE:%.*]], label [[COND_END]]
+; CHECK: cond.false:
+; CHECK-NEXT: br label [[COND_END]]
+; CHECK: cond.end:
+; CHECK-NEXT: [[INDVARS_IV_NEXT]] = add i64 [[INDVARS_IV]], 1
+; CHECK-NEXT: [[CMP:%.*]] = icmp ult i64 [[INDVARS_IV]], 1
+; CHECK-NEXT: br i1 [[CMP]], label [[FOR_BODY]], label [[FOR_COND_CLEANUP_LOOPEXIT]], !llvm.loop [[LOOP3:![0-9]+]]
+;
+entry:
+ br label %for.body
+
+for.cond.cleanup.loopexit: ; preds = %cond.end
+ ret i32 0
+
+for.body: ; preds = %cond.end, %entry
+ %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %cond.end ]
+ %zext.0 = zext i1 false to i64
+ %dead.insn = trunc i64 %zext.0 to i16
+ br i1 false, label %cond.false, label %cond.end
+
+cond.false: ; preds = %for.body
+ br label %cond.end
+
+cond.end: ; preds = %cond.false, %for.body
+ %indvars.iv.next = add i64 %indvars.iv, 1
+ %cmp = icmp ult i64 %indvars.iv, 1
+ br i1 %cmp, label %for.body, label %for.cond.cleanup.loopexit
+}
+;.
+; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
+; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
+; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
+; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META2]], [[META1]]}
+;.
>From 669cb8c1ce001fb37fc1997133260ed0821be0e0 Mon Sep 17 00:00:00 2001
From: Patrick O'Neill <patrick at rivosinc.com>
Date: Thu, 18 Apr 2024 10:09:06 -0700
Subject: [PATCH 2/2] fixup! [VPlan] Add scalar inferencing support for Not and
Or insns
---
.../Transforms/Vectorize/VPlanAnalysis.cpp | 9 ++-
.../LoopVectorize/vplan-infer-not-or-type.ll | 70 ++++++++++---------
2 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp b/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
index d38e5d23907174..8e22c4a4bdab7d 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp
@@ -45,9 +45,14 @@ Type *VPTypeAnalysis::inferScalarTypeForRecipe(const VPInstruction *R) {
CachedTypes[OtherV] = ResTy;
return ResTy;
}
- case VPInstruction::Not:
+ case VPInstruction::Not: {
+ Type *ResTy = inferScalarType(R->getOperand(0));
+ assert(IntegerType::get(Ctx, 1) == ResTy &&
+ "unexpected scalar type inferred for operand");
+ return ResTy;
+ }
case VPInstruction::PtrAdd:
- // Return the type based on the pointer/not argument (i.e. first operand).
+ // Return the type based on the pointer argument (i.e. first operand).
return inferScalarType(R->getOperand(0));
default:
break;
diff --git a/llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll b/llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll
index 488269c2eb6155..acef3488255c11 100644
--- a/llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll
+++ b/llvm/test/Transforms/LoopVectorize/vplan-infer-not-or-type.ll
@@ -4,54 +4,56 @@
; This test used to crash due to missing Or/Not cases in
; inferScalarTypeForRecipe.
-define i32 @foo() {
-; CHECK-LABEL: define i32 @foo() {
+define void @foo() {
+; CHECK-LABEL: define void @foo() {
; CHECK-NEXT: entry:
; CHECK-NEXT: br i1 false, label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
; CHECK: vector.ph:
; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
; CHECK: vector.body:
-; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
-; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 2
+; CHECK-NEXT: [[INDEX:%.*]] = phi i32 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
+; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i32 [[INDEX]], 2
; CHECK-NEXT: br i1 true, label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
; CHECK: middle.block:
-; CHECK-NEXT: br i1 true, label [[FOR_COND_CLEANUP_LOOPEXIT:%.*]], label [[SCALAR_PH]]
+; CHECK-NEXT: br i1 true, label [[LOOPEXIT:%.*]], label [[SCALAR_PH]]
; CHECK: scalar.ph:
-; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ 2, [[MIDDLE_BLOCK]] ], [ 0, [[ENTRY:%.*]] ]
-; CHECK-NEXT: br label [[FOR_BODY:%.*]]
-; CHECK: for.cond.cleanup.loopexit:
-; CHECK-NEXT: ret i32 0
-; CHECK: for.body:
-; CHECK-NEXT: [[INDVARS_IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ], [ [[INDVARS_IV_NEXT:%.*]], [[COND_END:%.*]] ]
-; CHECK-NEXT: [[ZEXT_0:%.*]] = zext i1 false to i64
-; CHECK-NEXT: [[DEAD_INSN:%.*]] = trunc i64 [[ZEXT_0]] to i16
-; CHECK-NEXT: br i1 false, label [[COND_FALSE:%.*]], label [[COND_END]]
-; CHECK: cond.false:
-; CHECK-NEXT: br label [[COND_END]]
-; CHECK: cond.end:
-; CHECK-NEXT: [[INDVARS_IV_NEXT]] = add i64 [[INDVARS_IV]], 1
-; CHECK-NEXT: [[CMP:%.*]] = icmp ult i64 [[INDVARS_IV]], 1
-; CHECK-NEXT: br i1 [[CMP]], label [[FOR_BODY]], label [[FOR_COND_CLEANUP_LOOPEXIT]], !llvm.loop [[LOOP3:![0-9]+]]
+; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i8 [ 2, [[MIDDLE_BLOCK]] ], [ 0, [[ENTRY:%.*]] ]
+; CHECK-NEXT: br label [[LOOP_HEADER:%.*]]
+; CHECK: loop.header:
+; CHECK-NEXT: [[INCREMENTOR:%.*]] = phi i8 [ [[ADD:%.*]], [[LATCH:%.*]] ], [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ]
+; CHECK-NEXT: [[AND:%.*]] = and i8 0, 0
+; CHECK-NEXT: [[EXTRACT_T:%.*]] = trunc i8 [[AND]] to i1
+; CHECK-NEXT: br i1 [[EXTRACT_T]], label [[LATCH]], label [[INDIRECT_LATCH:%.*]]
+; CHECK: indirect.latch:
+; CHECK-NEXT: br label [[LATCH]]
+; CHECK: latch:
+; CHECK-NEXT: [[ADD]] = add i8 [[INCREMENTOR]], 1
+; CHECK-NEXT: [[CONV:%.*]] = zext i8 [[INCREMENTOR]] to i32
+; CHECK-NEXT: [[CMP:%.*]] = icmp ult i32 [[CONV]], 1
+; CHECK-NEXT: br i1 [[CMP]], label [[LOOP_HEADER]], label [[LOOPEXIT]], !llvm.loop [[LOOP3:![0-9]+]]
+; CHECK: loop.exit:
+; CHECK-NEXT: ret void
;
entry:
- br label %for.body
+ br label %loop.header
-for.cond.cleanup.loopexit: ; preds = %cond.end
- ret i32 0
+loop.header: ; preds = %latch, %entry
+ %incrementor = phi i8 [ %add, %latch ], [ 0, %entry ]
+ %and = and i8 0, 0
+ %extract.t = trunc i8 %and to i1
+ br i1 %extract.t, label %latch, label %indirect.latch
-for.body: ; preds = %cond.end, %entry
- %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %cond.end ]
- %zext.0 = zext i1 false to i64
- %dead.insn = trunc i64 %zext.0 to i16
- br i1 false, label %cond.false, label %cond.end
+indirect.latch: ; preds = %loop.header
+ br label %latch
-cond.false: ; preds = %for.body
- br label %cond.end
+latch: ; preds = %loop.header16, %loop.header
+ %add = add i8 %incrementor, 1
+ %conv = zext i8 %incrementor to i32
+ %cmp = icmp ult i32 %conv, 1
+ br i1 %cmp, label %loop.header, label %loop.exit
-cond.end: ; preds = %cond.false, %for.body
- %indvars.iv.next = add i64 %indvars.iv, 1
- %cmp = icmp ult i64 %indvars.iv, 1
- br i1 %cmp, label %for.body, label %for.cond.cleanup.loopexit
+loop.exit:
+ ret void
}
;.
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]]}
More information about the llvm-commits
mailing list