Skip to content

[RISCV] Correct the spelling of the Zcmop mnemonics. #88826

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.

Sign up for GitHub

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 3 commits into from
Apr 16, 2024
Merged

[RISCV] Correct the spelling of the Zcmop mnemonics. #88826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a84a5d9
[RISCV] Correct the spelling of the Zcmop mnemonics.
topperc Apr 16, 2024
755a3bf
fixup! Fix column number in expect error.
topperc Apr 16, 2024
eb0f874
fixup! fix accidentally changed command line.
topperc Apr 16, 2024
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
2 changes: 1 addition & 1 deletion llvm/lib/Target/RISCV/RISCVInstrInfoZcmop.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ class CMOPInst<bits<3> imm3, string opcodestr>

foreach n = [1, 3, 5, 7, 9, 11, 13, 15] in {
let Predicates = [HasStdExtZcmop] in
def CMOP # n : CMOPInst<!srl(n, 1), "cmop." # n>, Sched<[]>;
def C_MOP # n : CMOPInst<!srl(n, 1), "c.mop." # n>, Sched<[]>;
}
6 changes: 3 additions & 3 deletions llvm/test/MC/RISCV/rv32zcmop-invalid.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# RUN: not llvm-mc -triple riscv32 -mattr=+zcmop < %s 2>&1 | FileCheck %s

cmop.0 # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
c.mop.0 # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic

cmop.1 t0 # CHECK: :[[@LINE]]:8: error: invalid operand for instruction
c.mop.1 t0 # CHECK: :[[@LINE]]:9: error: invalid operand for instruction

cmop.1 0x0 # CHECK: :[[@LINE]]:8: error: invalid operand for instruction
c.mop.1 0x0 # CHECK: :[[@LINE]]:9: error: invalid operand for instruction
32 changes: 16 additions & 16 deletions llvm/test/MC/RISCV/rvzcmop-valid.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@
# RUN: | llvm-objdump --mattr=+zcmop -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# CHECK-ASM-AND-OBJ: cmop.1
# CHECK-ASM-AND-OBJ: c.mop.1
# CHECK-ASM: encoding: [0x81,0x60]
cmop.1
c.mop.1

# CHECK-ASM-AND-OBJ: cmop.3
# CHECK-ASM-AND-OBJ: c.mop.3
# CHECK-ASM: encoding: [0x81,0x61]
cmop.3
c.mop.3

# CHECK-ASM-AND-OBJ: cmop.5
# CHECK-ASM-AND-OBJ: c.mop.5
# CHECK-ASM: encoding: [0x81,0x62]
cmop.5
c.mop.5

# CHECK-ASM-AND-OBJ: cmop.7
# CHECK-ASM-AND-OBJ: c.mop.7
# CHECK-ASM: encoding: [0x81,0x63]
cmop.7
c.mop.7

# CHECK-ASM-AND-OBJ: cmop.9
# CHECK-ASM-AND-OBJ: c.mop.9
# CHECK-ASM: encoding: [0x81,0x64]
cmop.9
c.mop.9

# CHECK-ASM-AND-OBJ: cmop.11
# CHECK-ASM-AND-OBJ: c.mop.11
# CHECK-ASM: encoding: [0x81,0x65]
cmop.11
c.mop.11

# CHECK-ASM-AND-OBJ: cmop.13
# CHECK-ASM-AND-OBJ: c.mop.13
# CHECK-ASM: encoding: [0x81,0x66]
cmop.13
c.mop.13

# CHECK-ASM-AND-OBJ: cmop.15
# CHECK-ASM-AND-OBJ: c.mop.15
# CHECK-ASM: encoding: [0x81,0x67]
cmop.15
c.mop.15