Skip to content

[RISCV][VLOpt] Kill all uses of and remove twoTimesVLMUL [NFC] #122003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 6 additions & 31 deletions llvm/lib/Target/RISCV/RISCVVLOptimizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,28 +129,6 @@ static raw_ostream &operator<<(raw_ostream &OS, const OperandInfo &OI) {

namespace llvm {
namespace RISCVVType {
/// Return the RISCVII::VLMUL that is two times VLMul.
/// Precondition: VLMul is not LMUL_RESERVED or LMUL_8.
static RISCVII::VLMUL twoTimesVLMUL(RISCVII::VLMUL VLMul) {
switch (VLMul) {
case RISCVII::VLMUL::LMUL_F8:
return RISCVII::VLMUL::LMUL_F4;
case RISCVII::VLMUL::LMUL_F4:
return RISCVII::VLMUL::LMUL_F2;
case RISCVII::VLMUL::LMUL_F2:
return RISCVII::VLMUL::LMUL_1;
case RISCVII::VLMUL::LMUL_1:
return RISCVII::VLMUL::LMUL_2;
case RISCVII::VLMUL::LMUL_2:
return RISCVII::VLMUL::LMUL_4;
case RISCVII::VLMUL::LMUL_4:
return RISCVII::VLMUL::LMUL_8;
case RISCVII::VLMUL::LMUL_8:
default:
llvm_unreachable("Could not multiply VLMul by 2");
}
}

/// Return EMUL = (EEW / SEW) * LMUL where EEW comes from Log2EEW and LMUL and
/// SEW are from the TSFlags of MI.
static std::pair<unsigned, bool>
Expand Down Expand Up @@ -559,9 +537,8 @@ static OperandInfo getOperandInfo(const MachineOperand &MO,
case RISCV::VFWCVT_F_X_V:
case RISCV::VFWCVT_F_F_V: {
unsigned Log2EEW = IsMODef ? MILog2SEW + 1 : MILog2SEW;
RISCVII::VLMUL EMUL =
IsMODef ? RISCVVType::twoTimesVLMUL(MIVLMul) : MIVLMul;
return OperandInfo(EMUL, Log2EEW);
return OperandInfo(RISCVVType::getEMULEqualsEEWDivSEWTimesLMUL(Log2EEW, MI),
Log2EEW);
}

// Def and Op1 uses EEW=2*SEW and EMUL=2*LMUL. Op2 uses EEW=SEW and EMUL=LMUL
Expand All @@ -581,9 +558,8 @@ static OperandInfo getOperandInfo(const MachineOperand &MO,
bool IsOp1 = HasPassthru ? MO.getOperandNo() == 2 : MO.getOperandNo() == 1;
bool TwoTimes = IsMODef || IsOp1;
unsigned Log2EEW = TwoTimes ? MILog2SEW + 1 : MILog2SEW;
RISCVII::VLMUL EMUL =
TwoTimes ? RISCVVType::twoTimesVLMUL(MIVLMul) : MIVLMul;
return OperandInfo(EMUL, Log2EEW);
return OperandInfo(RISCVVType::getEMULEqualsEEWDivSEWTimesLMUL(Log2EEW, MI),
Log2EEW);
}

// Vector Integer Extension
Expand Down Expand Up @@ -626,9 +602,8 @@ static OperandInfo getOperandInfo(const MachineOperand &MO,
bool IsOp1 = HasPassthru ? MO.getOperandNo() == 2 : MO.getOperandNo() == 1;
bool TwoTimes = IsOp1;
unsigned Log2EEW = TwoTimes ? MILog2SEW + 1 : MILog2SEW;
RISCVII::VLMUL EMUL =
TwoTimes ? RISCVVType::twoTimesVLMUL(MIVLMul) : MIVLMul;
return OperandInfo(EMUL, Log2EEW);
return OperandInfo(RISCVVType::getEMULEqualsEEWDivSEWTimesLMUL(Log2EEW, MI),
Log2EEW);
}

// Vector Mask Instructions
Expand Down
Loading