This is an archive of the discontinued LLVM Phabricator instance.

Differential D94836

[NFC] Disallow unused prefixes under MC/RISCV
ClosedPublic

Authored by mtrofin on Jan 15 2021, 3:23 PM.

Details

Reviewers
craig.topper
Commits
rGaa3d4d993959: [NFC] Disallow unused prefixes under MC/RISCV

Diff Detail

Event Timeline

mtrofin created this revision.Jan 15 2021, 3:23 PM
Herald added subscribers: frasercrmck, NickHung, evandro and 25 others. · View Herald TranscriptJan 15 2021, 3:23 PM
mtrofin requested review of this revision.Jan 15 2021, 3:23 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 15 2021, 3:23 PM
Herald added subscribers: llvm-commits, MaskRay. · View Herald Transcript
craig.topper accepted this revision.Jan 15 2021, 4:21 PM

LGTM

This revision is now accepted and ready to land.Jan 15 2021, 4:21 PM
This revision was landed with ongoing or failed builds.Jan 15 2021, 4:21 PM
Closed by commit rGaa3d4d993959: [NFC] Disallow unused prefixes under MC/RISCV (authored by mtrofin). · Explain Why
This revision was automatically updated to reflect the committed changes.
mtrofin added a commit: rGaa3d4d993959: [NFC] Disallow unused prefixes under MC/RISCV.
Harbormaster completed remote builds in B85437: Diff 317091.Jan 15 2021, 5:11 PM

Revision Contents

PathSize
llvm/
test/
MC/
RISCV/
8 lines
10 lines
4 lines
2 lines

Diff 317109

llvm/test/MC/RISCV/lit.local.cfg

from lit.llvm.subst import ToolSubst
if not 'RISCV' in config.root.targets: if not 'RISCV' in config.root.targets:
config.unsupported = True config.unsupported = True
fc = ToolSubst('FileCheck', unresolved='fatal')
# Insert this first. Then, we'll first update the blank FileCheck command; then,
# the default substitution of FileCheck will replace it to its full path.
config.substitutions.insert(0, (fc.regex,
'FileCheck --allow-unused-prefixes=false'))

llvm/test/MC/RISCV/rv32c-only-valid.s

# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -riscv-no-aliases -show-encoding \ # RUN: llvm-mc %s -triple=riscv32 -mattr=+c -riscv-no-aliases -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck --check-prefix=CHECK-ASM %s
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c < %s \ # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c < %s \
# RUN: | llvm-objdump --mattr=+c -M no-aliases -d -r - \ # RUN: | llvm-objdump --mattr=+c -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck --check-prefix=CHECK-OBJ %s
# #
# RUN: not llvm-mc -triple riscv32 \ # RUN: not llvm-mc -triple riscv32 \
# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \
# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s # RUN: | FileCheck --check-prefix=CHECK-NO-EXT %s
# RUN: not llvm-mc -triple riscv64 -mattr=+c \ # RUN: not llvm-mc -triple riscv64 -mattr=+c \
# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \
# RUN: | FileCheck -check-prefixes=CHECK-NO-RV32 %s # RUN: | FileCheck --check-prefix=CHECK-NO-RV32 %s
# RUN: not llvm-mc -triple riscv64 \ # RUN: not llvm-mc -triple riscv64 \
# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \
# RUN: | FileCheck -check-prefixes=CHECK-NO-RV32-AND-EXT %s # RUN: | FileCheck --check-prefix=CHECK-NO-RV32-AND-EXT %s
# CHECK-OBJ: c.jal 0x7fe # CHECK-OBJ: c.jal 0x7fe
# CHECK-ASM: c.jal 2046 # CHECK-ASM: c.jal 2046
# CHECK-ASM: encoding: [0xfd,0x2f] # CHECK-ASM: encoding: [0xfd,0x2f]
# CHECK-NO-EXT: error: instruction requires the following: 'C' (Compressed Instructions) # CHECK-NO-EXT: error: instruction requires the following: 'C' (Compressed Instructions)
# CHECK-NO-RV32: error: instruction requires the following: RV32I Base Instruction Set # CHECK-NO-RV32: error: instruction requires the following: RV32I Base Instruction Set
# CHECK-NO-RV32-AND-EXT: error: instruction requires the following: 'C' (Compressed Instructions), RV32I Base Instruction Set # CHECK-NO-RV32-AND-EXT: error: instruction requires the following: 'C' (Compressed Instructions), RV32I Base Instruction Set
c.jal 2046 c.jal 2046

llvm/test/MC/RISCV/rv32zfh-valid.s

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \ # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \ # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zfh < %s \ # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zfh < %s \
# RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \ # RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zfh < %s \ # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zfh < %s \
# RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \ # RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
# CHECK-ASM-AND-OBJ: flh ft0, 12(a0) # CHECK-ASM-AND-OBJ: flh ft0, 12(a0)
# CHECK-ASM: encoding: [0x07,0x10,0xc5,0x00] # CHECK-ASM: encoding: [0x07,0x10,0xc5,0x00]
flh f0, 12(a0) flh f0, 12(a0)
# CHECK-ASM-AND-OBJ: flh ft1, 4(ra) # CHECK-ASM-AND-OBJ: flh ft1, 4(ra)
# CHECK-ASM: encoding: [0x87,0x90,0x40,0x00] # CHECK-ASM: encoding: [0x87,0x90,0x40,0x00]
flh f1, +4(ra) flh f1, +4(ra)
# CHECK-ASM-AND-OBJ: flh ft2, -2048(a3) # CHECK-ASM-AND-OBJ: flh ft2, -2048(a3)
▲ Show 20 Lines • Show All 148 Lines • Show Last 20 Lines

llvm/test/MC/RISCV/rv64zfh-valid.s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \ # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zfh < %s \ # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zfh < %s \
# RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \ # RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
# #
# RUN: not llvm-mc -triple riscv32 -mattr=+experimental-zfh < %s 2>&1 \ # RUN: not llvm-mc -triple riscv32 -mattr=+experimental-zfh < %s 2>&1 \
# RUN: | FileCheck -check-prefix=CHECK-RV32 %s # RUN: | FileCheck -check-prefix=CHECK-RV32 %s
# CHECK-ASM-AND-OBJ: fcvt.l.h a0, ft0, dyn # CHECK-ASM-AND-OBJ: fcvt.l.h a0, ft0, dyn
# CHECK-ASM: encoding: [0x53,0x75,0x20,0xc4] # CHECK-ASM: encoding: [0x53,0x75,0x20,0xc4]
# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set # CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
fcvt.l.h a0, ft0, dyn fcvt.l.h a0, ft0, dyn
Show All 26 Lines