This is an archive of the discontinued LLVM Phabricator instance.

Differential D122282

[RISCV][NFC] Modify the test case
ClosedPublic

Authored by Miss_Grape on Mar 22 2022, 8:30 PM.

Details

Reviewers
craig.topper
benshi001
Commits
rG8568d681ae14: [RISCV][NFC] Improve encoding/decoding tests for Zbb/Zbp/Zbt instructions

Diff Detail

Unit TestsFailed

TimeTest
60,150 msx64 debian > AddressSanitizer-x86_64-linux-dynamic.TestCases::scariness_score_test.cpp
60,130 msx64 debian > AddressSanitizer-x86_64-linux.TestCases::scariness_score_test.cpp
60,020 msx64 debian > MLIR.Examples/standalone::test.toy

Event Timeline

Miss_Grape created this revision.Mar 22 2022, 8:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 22 2022, 8:30 PM
Herald added subscribers: • s, VincentWu, luke957 and 28 others. · View Herald Transcript
Miss_Grape requested review of this revision.Mar 22 2022, 8:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 22 2022, 8:30 PM
Herald added subscribers: llvm-commits, • pcwang-thead, eopXD and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B155763: Diff 417481.Mar 22 2022, 9:36 PM
Miss_Grape updated this revision to Diff 418164.Mar 25 2022, 2:36 AM
Miss_Grape retitled this revision from [RISCV] Remove invalid tests for zbb to [RISCV][NFC] Modify the test case.
Miss_Grape added a comment.Mar 25 2022, 2:43 AM

zext.h is not an alias but real instruction of zbb, so move it to rv32zbb-valid.s

benshi001 accepted this revision.Mar 25 2022, 2:48 AM

LGTM

This revision is now accepted and ready to land.Mar 25 2022, 2:48 AM
Harbormaster completed remote builds in B156241: Diff 418164.Mar 25 2022, 3:44 AM
This revision was landed with ongoing or failed builds.Mar 29 2022, 12:46 AM
Closed by commit rG8568d681ae14: [RISCV][NFC] Improve encoding/decoding tests for Zbb/Zbp/Zbt instructions (authored by Miss_Grape, committed by benshi001). · Explain Why
This revision was automatically updated to reflect the committed changes.
benshi001 added a commit: rG8568d681ae14: [RISCV][NFC] Improve encoding/decoding tests for Zbb/Zbp/Zbt instructions.
Herald added a subscriber: sunshaoce. · View Herald TranscriptMar 29 2022, 12:46 AM
benshi001 added a comment.EditedMar 29 2022, 12:47 AM

I have kept the test of zext.h x5, x6 in the aliases test files, and only committed the newly added encoding/decoding tests.

Revision Contents

Diff 417481

llvm/test/MC/RISCV/rv32zbb-aliases-valid.s

Show All 9 Lines
# RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s # RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s
# The following check prefixes are used in this test: # The following check prefixes are used in this test:
# CHECK-S-OBJ Match both the .s and objdumped object output with # CHECK-S-OBJ Match both the .s and objdumped object output with
# aliases enabled # aliases enabled
# CHECK-S-OBJ-NOALIAS Match both the .s and objdumped object output with # CHECK-S-OBJ-NOALIAS Match both the .s and objdumped object output with
# aliases disabled # aliases disabled
# CHECK-S-OBJ-NOALIAS: zext.h t0, t1
# CHECK-S-OBJ: zext.h t0, t1
zext.h x5, x6
# CHECK-S-OBJ-NOALIAS: rev8 t0, t1 # CHECK-S-OBJ-NOALIAS: rev8 t0, t1
# CHECK-S-OBJ: rev8 t0, t1 # CHECK-S-OBJ: rev8 t0, t1
rev8 x5, x6 rev8 x5, x6
# CHECK-S-OBJ-NOALIAS: orc.b t0, t1 # CHECK-S-OBJ-NOALIAS: orc.b t0, t1
# CHECK-S-OBJ: orc.b t0, t1 # CHECK-S-OBJ: orc.b t0, t1
orc.b x5, x6 orc.b x5, x6
# CHECK-S-OBJ-NOALIAS: rori t0, t1, 8 # CHECK-S-OBJ-NOALIAS: rori t0, t1, 8
# CHECK-S-OBJ: rori t0, t1, 8 # CHECK-S-OBJ: rori t0, t1, 8
ror x5, x6, 8 ror x5, x6, 8

llvm/test/MC/RISCV/rv32zbp-aliases-valid.s

Show All 9 Lines
# RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s # RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s
# The following check prefixes are used in this test: # The following check prefixes are used in this test:
# CHECK-S-OBJ Match both the .s and objdumped object output with # CHECK-S-OBJ Match both the .s and objdumped object output with
# aliases enabled # aliases enabled
# CHECK-S-OBJ-NOALIAS Match both the .s and objdumped object output with # CHECK-S-OBJ-NOALIAS Match both the .s and objdumped object output with
# aliases disabled # aliases disabled
# CHECK-S-OBJ-NOALIAS: zext.h t0, t1
# CHECK-S-OBJ: zext.h t0, t1
zext.h x5, x6
# CHECK-S-OBJ-NOALIAS: grevi t0, t1, 1 # CHECK-S-OBJ-NOALIAS: grevi t0, t1, 1
# CHECK-S-OBJ: rev.p t0, t1 # CHECK-S-OBJ: rev.p t0, t1
rev.p x5, x6 rev.p x5, x6
# CHECK-S-OBJ-NOALIAS: grevi t0, t1, 2 # CHECK-S-OBJ-NOALIAS: grevi t0, t1, 2
# CHECK-S-OBJ: rev2.n t0, t1 # CHECK-S-OBJ: rev2.n t0, t1
rev2.n x5, x6 rev2.n x5, x6
▲ Show 20 Lines • Show All 203 Lines • Show Last 20 Lines

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

# With Bitmanip ternary extension: # With Bitmanip ternary extension:
# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbt -show-encoding \ # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbt -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-zbt -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbt < %s \ # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbt < %s \
# RUN: | llvm-objdump --mattr=+experimental-zbt -d -r - \ # RUN: | llvm-objdump --mattr=+experimental-zbt -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbt < %s \
# RUN: | llvm-objdump --mattr=+experimental-zbt -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
# CHECK-ASM-AND-OBJ: cmix t0, t1, t2, t3 # CHECK-ASM-AND-OBJ: cmix t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0x92,0x63,0xe6] # CHECK-ASM: encoding: [0xb3,0x92,0x63,0xe6]
cmix t0, t1, t2, t3 cmix t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: cmov t0, t1, t2, t3 # CHECK-ASM-AND-OBJ: cmov t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0xd2,0x63,0xe6] # CHECK-ASM: encoding: [0xb3,0xd2,0x63,0xe6]
cmov t0, t1, t2, t3 cmov t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsl t0, t1, t2, t3 # CHECK-ASM-AND-OBJ: fsl t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0x12,0xc3,0x3d] # CHECK-ASM: encoding: [0xb3,0x12,0xc3,0x3d]
fsl t0, t1, t2, t3 fsl t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsr t0, t1, t2, t3 # CHECK-ASM-AND-OBJ: fsr t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0x52,0xc3,0x3d] # CHECK-ASM: encoding: [0xb3,0x52,0xc3,0x3d]
fsr t0, t1, t2, t3 fsr t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsri t0, t1, t2, 0 # CHECK-ASM-AND-OBJ: fsri t0, t1, t2, 0
# CHECK-ASM: encoding: [0x93,0x52,0x03,0x3c] # CHECK-ASM: encoding: [0x93,0x52,0x03,0x3c]
fsri t0, t1, t2, 0 fsri t0, t1, t2, 0

llvm/test/MC/RISCV/rv64zbp-aliases-valid.s

Show All 9 Lines
# RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s # RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s
# The following check prefixes are used in this test: # The following check prefixes are used in this test:
# CHECK-S-OBJ Match both the .s and objdumped object output with # CHECK-S-OBJ Match both the .s and objdumped object output with
# aliases enabled # aliases enabled
# CHECK-S-OBJ-NOALIAS Match both the .s and objdumped object output with # CHECK-S-OBJ-NOALIAS Match both the .s and objdumped object output with
# aliases disabled # aliases disabled
# CHECK-S-OBJ-NOALIAS: zext.h t0, t1
# CHECK-S-OBJ: zext.h t0, t1
zext.h x5, x6
# CHECK-S-OBJ-NOALIAS: grevi t0, t1, 1 # CHECK-S-OBJ-NOALIAS: grevi t0, t1, 1
# CHECK-S-OBJ: rev.p t0, t1 # CHECK-S-OBJ: rev.p t0, t1
rev.p x5, x6 rev.p x5, x6
# CHECK-S-OBJ-NOALIAS: grevi t0, t1, 2 # CHECK-S-OBJ-NOALIAS: grevi t0, t1, 2
# CHECK-S-OBJ: rev2.n t0, t1 # CHECK-S-OBJ: rev2.n t0, t1
rev2.n x5, x6 rev2.n x5, x6
▲ Show 20 Lines • Show All 312 Lines • Show Last 20 Lines

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

# With Bitmanip ternary extension: # With Bitmanip ternary extension:
# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbt -show-encoding \ # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbt -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-zbt < %s \ # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbt < %s \
# RUN: | llvm-objdump --mattr=+experimental-zbt -d -r - \ # RUN: | llvm-objdump --mattr=+experimental-zbt -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
# CHECK-ASM-AND-OBJ: cmix t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0x92,0x63,0xe6]
cmix t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: cmov t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0xd2,0x63,0xe6]
cmov t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsl t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0x12,0xc3,0x3d]
fsl t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsr t0, t1, t2, t3
# CHECK-ASM: encoding: [0xb3,0x52,0xc3,0x3d]
fsr t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsri t0, t1, t2, 0
# CHECK-ASM: encoding: [0x93,0x52,0x03,0x3c]
fsri t0, t1, t2, 0
# CHECK-ASM-AND-OBJ: fslw t0, t1, t2, t3 # CHECK-ASM-AND-OBJ: fslw t0, t1, t2, t3
# CHECK-ASM: encoding: [0xbb,0x12,0xc3,0x3d] # CHECK-ASM: encoding: [0xbb,0x12,0xc3,0x3d]
fslw t0, t1, t2, t3 fslw t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsrw t0, t1, t2, t3 # CHECK-ASM-AND-OBJ: fsrw t0, t1, t2, t3
# CHECK-ASM: encoding: [0xbb,0x52,0xc3,0x3d] # CHECK-ASM: encoding: [0xbb,0x52,0xc3,0x3d]
fsrw t0, t1, t2, t3 fsrw t0, t1, t2, t3
# CHECK-ASM-AND-OBJ: fsriw t0, t1, t2, 0 # CHECK-ASM-AND-OBJ: fsriw t0, t1, t2, 0
# CHECK-ASM: encoding: [0x9b,0x52,0x03,0x3c] # CHECK-ASM: encoding: [0x9b,0x52,0x03,0x3c]
fsriw t0, t1, t2, 0 fsriw t0, t1, t2, 0