Add constexpr.

Mel-Chen · Mel-Chen · commit 741d6c0eba6b · 2024-07-18T17:36:01.000-07:00
diff --git a/llvm/include/llvm/Transforms/Utils/LoopUtils.h b/llvm/include/llvm/Transforms/Utils/LoopUtils.h
@@ -361,7 +361,7 @@ bool canSinkOrHoistInst(Instruction &I, AAResults *AA, DominatorTree *DT,
 
 /// Returns the llvm.vector.reduce intrinsic that corresponds to the recurrence
 /// kind.
-Intrinsic::ID getReductionIntrinsicID(RecurKind RK);
+constexpr Intrinsic::ID getReductionIntrinsicID(RecurKind RK);
 
 /// Returns the arithmetic instruction opcode used when expanding a reduction.
 unsigned getArithmeticReductionInstruction(Intrinsic::ID RdxID);
diff --git a/llvm/lib/IR/IntrinsicInst.cpp b/llvm/lib/IR/IntrinsicInst.cpp
@@ -599,14 +599,13 @@ Intrinsic::ID VPIntrinsic::getForOpcode(unsigned IROPC) {
   return Intrinsic::not_intrinsic;
 }
 
-Intrinsic::ID VPIntrinsic::getForIntrinsic(Intrinsic::ID Id) {
-  if (isVPIntrinsic(Id))
+constexpr static Intrinsic::ID getForIntrinsic(Intrinsic::ID Id) {
+  if (::isVPIntrinsic(Id))
     return Id;
 
   switch (Id) {
   default:
     break;
-
 #define BEGIN_REGISTER_VP_INTRINSIC(VPID, ...) break;
 #define VP_PROPERTY_FUNCTIONAL_INTRINSIC(INTRIN) case Intrinsic::INTRIN:
 #define END_REGISTER_VP_INTRINSIC(VPID) return Intrinsic::VPID;
@@ -615,6 +614,10 @@ Intrinsic::ID VPIntrinsic::getForIntrinsic(Intrinsic::ID Id) {
   return Intrinsic::not_intrinsic;
 }
 
+Intrinsic::ID VPIntrinsic::getForIntrinsic(Intrinsic::ID Id) {
+  return ::getForIntrinsic(Id);
+}
+
 bool VPIntrinsic::canIgnoreVectorLengthParam() const {
   using namespace PatternMatch;
 
diff --git a/llvm/lib/Transforms/Utils/LoopUtils.cpp b/llvm/lib/Transforms/Utils/LoopUtils.cpp
@@ -918,7 +918,7 @@ bool llvm::hasIterationCountInvariantInParent(Loop *InnerLoop,
   return true;
 }
 
-Intrinsic::ID llvm::getReductionIntrinsicID(RecurKind RK) {
+constexpr Intrinsic::ID llvm::getReductionIntrinsicID(RecurKind RK) {
   switch (RK) {
   default:
     llvm_unreachable("Unexpected recurrence kind");

Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,7 @@ bool llvm::hasIterationCountInvariantInParent(Loop *InnerLoop,`
`918`	`918`	`return true;`
`919`	`919`	`}`
`920`	`920`
`921`		`-Intrinsic::ID llvm::getReductionIntrinsicID(RecurKind RK) {`
	`921`	`+constexpr Intrinsic::ID llvm::getReductionIntrinsicID(RecurKind RK) {`
`922`	`922`	`switch (RK) {`
`923`	`923`	`default:`
`924`	`924`	`llvm_unreachable("Unexpected recurrence kind");`