Revert "NEED_FIX: Requires cost of vp.merge in RISCV TTI"

Mel-Chen · Mel-Chen · commit fe62b35bf97a · 2024-10-22T00:30:33.000-07:00
This reverts commit 817d761.
diff --git a/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp b/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
@@ -1168,8 +1168,6 @@ RISCVTTIImpl::getIntrinsicInstrCost(const IntrinsicCostAttributes &ICA,
         *FOp, ICA.getArgTypes()[0], UI->getPointerAlignment(),
         UI->getOperand(1)->getType()->getPointerAddressSpace(), CostKind);
   }
-  case Intrinsic::vp_merge:
-    return 1;
   case Intrinsic::vp_select: {
     Intrinsic::ID IID = ICA.getID();
     std::optional<unsigned> FOp = VPIntrinsic::getFunctionalOpcodeForVP(IID);

Original file line number	Diff line number	Diff line change
`@@ -1168,8 +1168,6 @@ RISCVTTIImpl::getIntrinsicInstrCost(const IntrinsicCostAttributes &ICA,`
`1168`	`1168`	`*FOp, ICA.getArgTypes()[0], UI->getPointerAlignment(),`
`1169`	`1169`	`UI->getOperand(1)->getType()->getPointerAddressSpace(), CostKind);`
`1170`	`1170`	`}`
`1171`		`- case Intrinsic::vp_merge:`
`1172`		`- return 1;`
`1173`	`1171`	`case Intrinsic::vp_select: {`
`1174`	`1172`	`Intrinsic::ID IID = ICA.getID();`
`1175`	`1173`	`std::optional<unsigned> FOp = VPIntrinsic::getFunctionalOpcodeForVP(IID);`