Skip to content

Commit dbaaf8f

Browse files
Fixed consequences of PR llvm#112314. Removed support for load
1 parent 1ae923d commit dbaaf8f

File tree

4 files changed

+1
-81
lines changed

4 files changed

+1
-81
lines changed

llvm/test/tools/llvm-exegesis/RISCV/latency-by-extension-C.s

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,3 @@ C_SRLI-NEXT: key:
4646
C_SRLI-NEXT: instructions:
4747
C_SRLI-NEXT: - 'C_SRLI [[REG101:X[0-9]+]] [[REG102:X[0-9]+]] [[IMM10:i_0x[0-9]+]]'
4848
C_SRLI-DAG: ...
49-
50-
51-
# RUN: llvm-exegesis -mode=latency -mtriple=riscv64-unknown-linux-gnu --mcpu=generic --benchmark-phase=assemble-measured-code -opcode-name=C_LD -mattr=+c | FileCheck --check-prefix=C_LD %s
52-
53-
C_LD: ---
54-
C_LD-NEXT: mode: latency
55-
C_LD-NEXT: key:
56-
C_LD-NEXT: instructions:
57-
C_LD-NEXT: - 'C_LD [[REG61:X[0-9]+]] [[REG62:X[0-9]+]] [[IMM6:i_0x[0-9]+]]'
58-
59-
# RUN: llvm-exegesis -mode=latency -mtriple=riscv64-unknown-linux-gnu --mcpu=generic --benchmark-phase=assemble-measured-code -opcode-name=C_LW -mattr=+c | FileCheck --check-prefix=C_LW %s
60-
61-
C_LW: ---
62-
C_LW-NEXT: mode: latency
63-
C_LW-NEXT: key:
64-
C_LW-NEXT: instructions:
65-
C_LW-NEXT: - 'C_LW [[REG71:X[0-9]+]] [[REG72:X[0-9]+]] [[IMM7:i_0x[0-9]+]]'

llvm/test/tools/llvm-exegesis/RISCV/latency-by-load.s

Lines changed: 0 additions & 59 deletions
This file was deleted.

llvm/tools/llvm-exegesis/lib/CodeTemplate.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ struct CodeTemplate {
135135
// the pointer to this memory is passed in to the function.
136136
unsigned ScratchSpacePointerInReg = 0;
137137

138-
// Require to pre-store value of a given register (fisrt)
139-
// to scratch memory with given offset (second)
140-
SmallVector<std::pair<unsigned, unsigned>, 2> PreinitScratchMemory;
141-
142138
#if defined(__GNUC__) && (defined(__clang__) || LLVM_GNUC_PREREQ(8, 0, 0))
143139
// FIXME: GCC7 bug workaround. Drop #if after GCC7 no longer supported.
144140
private:

llvm/tools/llvm-exegesis/lib/RISCV/Target.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ void ExegesisRISCVTarget::processInstructionReservedRegs(
344344
case RISCV::C_ADDI4SPN:
345345
AssignedValue = MCOperand::createReg(RISCV::X2);
346346
break;
347-
case RISCV::C_ADDI_NOP:
347+
case RISCV::C_NOP:
348348
case RISCV::C_LI_HINT:
349349
case RISCV::C_LUI_HINT:
350350
case RISCV::C_MV_HINT:

0 commit comments

Comments
 (0)