[llvm] c315d78 - [VP] Reduce duplicate code in vp.reduce expansions
Philip Reames via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 30 12:35:14 PDT 2024
Author: Philip Reames
Date: 2024-08-30T12:34:56-07:00
New Revision: c315d787e3680e7f48d9de0502bb83300b190f84
URL: https://github.com/llvm/llvm-project/commit/c315d787e3680e7f48d9de0502bb83300b190f84
DIFF: https://github.com/llvm/llvm-project/commit/c315d787e3680e7f48d9de0502bb83300b190f84.diff
LOG: [VP] Reduce duplicate code in vp.reduce expansions
Primary goal is having one way of doing this, to ensure that we don't
end up with accidental divergence.
Added:
Modified:
llvm/lib/CodeGen/ExpandVectorPredication.cpp
Removed:
################################################################################
diff --git a/llvm/lib/CodeGen/ExpandVectorPredication.cpp b/llvm/lib/CodeGen/ExpandVectorPredication.cpp
index 675d88d6d38cd9..5140f5951d6d3f 100644
--- a/llvm/lib/CodeGen/ExpandVectorPredication.cpp
+++ b/llvm/lib/CodeGen/ExpandVectorPredication.cpp
@@ -26,6 +26,7 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Debug.h"
+#include "llvm/Transforms/Utils/LoopUtils.h"
#include <optional>
using namespace llvm;
@@ -437,69 +438,33 @@ CachingVPExpander::expandPredicationInReduction(IRBuilder<> &Builder,
default:
llvm_unreachable("Impossible reduction kind");
case Intrinsic::vp_reduce_add:
- Reduction = Builder.CreateAddReduce(RedOp);
- Reduction = Builder.CreateAdd(Reduction, Start);
- break;
case Intrinsic::vp_reduce_mul:
- Reduction = Builder.CreateMulReduce(RedOp);
- Reduction = Builder.CreateMul(Reduction, Start);
- break;
case Intrinsic::vp_reduce_and:
- Reduction = Builder.CreateAndReduce(RedOp);
- Reduction = Builder.CreateAnd(Reduction, Start);
- break;
case Intrinsic::vp_reduce_or:
- Reduction = Builder.CreateOrReduce(RedOp);
- Reduction = Builder.CreateOr(Reduction, Start);
- break;
- case Intrinsic::vp_reduce_xor:
- Reduction = Builder.CreateXorReduce(RedOp);
- Reduction = Builder.CreateXor(Reduction, Start);
- break;
- case Intrinsic::vp_reduce_smax:
- Reduction = Builder.CreateIntMaxReduce(RedOp, /*IsSigned*/ true);
+ case Intrinsic::vp_reduce_xor: {
+ Intrinsic::ID RedID = *VPI.getFunctionalIntrinsicID();
+ unsigned Opc = getArithmeticReductionInstruction(RedID);
+ assert(Instruction::isBinaryOp(Opc));
+ Reduction = Builder.CreateUnaryIntrinsic(RedID, RedOp);
Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::smax, Reduction, Start);
+ Builder.CreateBinOp((Instruction::BinaryOps)Opc, Reduction, Start);
break;
+ }
+ case Intrinsic::vp_reduce_smax:
case Intrinsic::vp_reduce_smin:
- Reduction = Builder.CreateIntMinReduce(RedOp, /*IsSigned*/ true);
- Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::smin, Reduction, Start);
- break;
case Intrinsic::vp_reduce_umax:
- Reduction = Builder.CreateIntMaxReduce(RedOp, /*IsSigned*/ false);
- Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::umax, Reduction, Start);
- break;
case Intrinsic::vp_reduce_umin:
- Reduction = Builder.CreateIntMinReduce(RedOp, /*IsSigned*/ false);
- Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::umin, Reduction, Start);
- break;
case Intrinsic::vp_reduce_fmax:
- Reduction = Builder.CreateFPMaxReduce(RedOp);
- transferDecorations(*Reduction, VPI);
- Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::maxnum, Reduction, Start);
- break;
case Intrinsic::vp_reduce_fmin:
- Reduction = Builder.CreateFPMinReduce(RedOp);
- transferDecorations(*Reduction, VPI);
- Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::minnum, Reduction, Start);
- break;
case Intrinsic::vp_reduce_fmaximum:
- Reduction = Builder.CreateFPMaximumReduce(RedOp);
- transferDecorations(*Reduction, VPI);
- Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::maximum, Reduction, Start);
- break;
- case Intrinsic::vp_reduce_fminimum:
- Reduction = Builder.CreateFPMinimumReduce(RedOp);
+ case Intrinsic::vp_reduce_fminimum: {
+ Intrinsic::ID RedID = *VPI.getFunctionalIntrinsicID();
+ Intrinsic::ID ScalarID = getMinMaxReductionIntrinsicOp(RedID);
+ Reduction = Builder.CreateUnaryIntrinsic(RedID, RedOp);
transferDecorations(*Reduction, VPI);
- Reduction =
- Builder.CreateBinaryIntrinsic(Intrinsic::minimum, Reduction, Start);
+ Reduction = Builder.CreateBinaryIntrinsic(ScalarID, Reduction, Start);
break;
+ }
case Intrinsic::vp_reduce_fadd:
Reduction = Builder.CreateFAddReduce(Start, RedOp);
break;
More information about the llvm-commits
mailing list