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

Mel-Chen · Mel-Chen · commit cf154baf51a7 · 2024-10-18T02:33:50.000-07:00
This reverts commit 817d761.
diff --git a/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp b/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
@@ -1123,8 +1123,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
`@@ -1123,8 +1123,6 @@ RISCVTTIImpl::getIntrinsicInstrCost(const IntrinsicCostAttributes &ICA,`
`1123`	`1123`	`*FOp, ICA.getArgTypes()[0], UI->getPointerAlignment(),`
`1124`	`1124`	`UI->getOperand(1)->getType()->getPointerAddressSpace(), CostKind);`
`1125`	`1125`	`}`
`1126`		`- case Intrinsic::vp_merge:`
`1127`		`- return 1;`
`1128`	`1126`	`case Intrinsic::vp_select: {`
`1129`	`1127`	`Intrinsic::ID IID = ICA.getID();`
`1130`	`1128`	`std::optional<unsigned> FOp = VPIntrinsic::getFunctionalOpcodeForVP(IID);`