diff --git a/llvm/include/llvm/Support/InstructionCost.h b/llvm/include/llvm/Support/InstructionCost.h index fe56d49b4174..725f8495ac09 100644 --- a/llvm/include/llvm/Support/InstructionCost.h +++ b/llvm/include/llvm/Support/InstructionCost.h @@ -196,14 +196,6 @@ public: return *this >= RHS2; } - static InstructionCost min(InstructionCost LHS, InstructionCost RHS) { - return LHS < RHS ? LHS : RHS; - } - - static InstructionCost max(InstructionCost LHS, InstructionCost RHS) { - return LHS > RHS ? LHS : RHS; - } - void print(raw_ostream &OS) const; }; diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 5b91495bd844..bd673d112b3a 100644 --- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -6305,7 +6305,7 @@ bool SLPVectorizerPass::tryToVectorizeList(ArrayRef VL, BoUpSLP &R, Cost -= UserCost; } - MinCost = InstructionCost::min(MinCost, Cost); + MinCost = std::min(MinCost, Cost); if (Cost.isValid() && Cost < -SLPCostThreshold) { LLVM_DEBUG(dbgs() << "SLP: Vectorizing list at cost:" << Cost << ".\n"); diff --git a/llvm/unittests/Support/InstructionCostTest.cpp b/llvm/unittests/Support/InstructionCostTest.cpp index da3d3f47a212..8ba9f990f027 100644 --- a/llvm/unittests/Support/InstructionCostTest.cpp +++ b/llvm/unittests/Support/InstructionCostTest.cpp @@ -59,6 +59,6 @@ TEST_F(CostTest, Operators) { EXPECT_EQ(*(VThree.getValue()), 3); EXPECT_EQ(IThreeA.getValue(), None); - EXPECT_EQ(InstructionCost::min(VThree, VNegTwo), -2); - EXPECT_EQ(InstructionCost::max(VThree, VSix), 6); + EXPECT_EQ(std::min(VThree, VNegTwo), -2); + EXPECT_EQ(std::max(VThree, VSix), 6); }