Skip to content

Commit bddd7fd

Browse files
committed
Revert "[RISCV] Disable this transform by default, except for SpacemiT X60"
This reverts commit 63f902d.
1 parent b243fbc commit bddd7fd

15 files changed

+1824
-2248
lines changed

llvm/lib/Target/RISCV/RISCVFeatures.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,9 +1417,6 @@ def TuneVentanaVeyron : SubtargetFeature<"ventana-veyron", "RISCVProcFamily", "V
14171417
def TuneVXRMPipelineFlush : SubtargetFeature<"vxrm-pipeline-flush", "HasVXRMPipelineFlush",
14181418
"true", "VXRM writes causes pipeline flush">;
14191419

1420-
def TuneCheapVWMul : SubtargetFeature<"cheap-vwmul", "HasCheapVWMul", "true",
1421-
"Fold vector shift of sign/zero extension to widening multiply">;
1422-
14231420
// Assume that lock-free native-width atomics are available, even if the target
14241421
// and operating system combination would not usually provide them. The user
14251422
// is responsible for providing any necessary __sync implementations. Code

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17351,9 +17351,6 @@ static SDValue performSHLCombine(SDNode *N,
1735117351
// (shl (sext x), C) -> (vwmulsu x, 1u << C)
1735217352
// (shl (zext x), C) -> (vwmulu x, 1u << C)
1735317353

17354-
if (!Subtarget.hasCheapVWMul())
17355-
return SDValue();
17356-
1735717354
if (!DCI.isAfterLegalizeDAG())
1735817355
return SDValue();
1735917356

llvm/lib/Target/RISCV/RISCVProcessors.td

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,7 @@ def SPACEMIT_X60 : RISCVProcessorModel<"spacemit-x60",
553553
TuneOptimizedNF2SegmentLoadStore,
554554
TuneOptimizedNF3SegmentLoadStore,
555555
TuneOptimizedNF4SegmentLoadStore,
556-
TuneVXRMPipelineFlush,
557-
TuneCheapVWMul]> {
556+
TuneVXRMPipelineFlush]> {
558557
let MVendorID = 0x710;
559558
let MArchID = 0x8000000058000001;
560559
let MImpID = 0x1000000049772200;

0 commit comments

Comments
 (0)