Commit e1d61789 authored by Craig Topper's avatar Craig Topper
Browse files

[RISCV] Add rv64 run lines to rv32 MC layer tests for B extension 

Remove common instructions from rv64 tests since they are now
covered by the rv64 run lines in the rv32 tests.

Add rv32-only* tests for a few cases that aren't common between
r32 and rv64.

Addresses review feedback from D95150.

Reviewed By: frasercrmck

Differential Revision: https://reviews.llvm.org/D95272
parent bb9eb198

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

+10 −0
Original line number Diff line number Diff line 
# With B extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# With Bitmanip base extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zba -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zba -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zba < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zba -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zba < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zba -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# CHECK-ASM-AND-OBJ: sh1add t0, t1, t2

# CHECK-ASM: encoding: [0xb3,0x22,0x73,0x20]

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

+10 −9
Original line number Diff line number Diff line 
# With B extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# With Bitmanip base extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbb -riscv-no-aliases -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -riscv-no-aliases -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbb < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbb -M no-aliases -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbb < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbb -M no-aliases -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# CHECK-ASM-AND-OBJ: clz t0, t1

# CHECK-ASM: encoding: [0x93,0x12,0x03,0x60]
@@ -39,12 +49,3 @@ max t0, t1, t2 
# CHECK-ASM-AND-OBJ: maxu t0, t1, t2

# CHECK-ASM: encoding: [0xb3,0x72,0x73,0x0a]

maxu t0, t1, t2
 
# CHECK-ASM-AND-OBJ: zext.h t0, t1

# CHECK-ASM: encoding: [0xb3,0x42,0x03,0x08]

zext.h t0, t1

# CHECK-ASM-AND-OBJ: rev8 t0, t1

# CHECK-ASM: encoding: [0x93,0x52,0x83,0x69]

rev8 t0, t1

# CHECK-ASM-AND-OBJ: orc.b t0, t1

# CHECK-ASM: encoding: [0x93,0x52,0x73,0x28]

orc.b t0, t1

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

0 → 100644
+27 −0
Original line number Diff line number Diff line 
# With B extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# With Bitmanip base extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbb -riscv-no-aliases -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbb < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbb -M no-aliases -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# With Bitmanip permutation extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbp -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbp < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbp -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# CHECK-ASM-AND-OBJ: zext.h t0, t1

# CHECK-ASM: encoding: [0xb3,0x42,0x03,0x08]

zext.h t0, t1

# CHECK-ASM-AND-OBJ: rev8 t0, t1

# CHECK-ASM: encoding: [0x93,0x52,0x83,0x69]

rev8 t0, t1

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

+18 −0
Original line number Diff line number Diff line 
# With B extension:

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
@@ -8,6 +13,11 @@ 
# With Bitmanip base extension:

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbb < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbb -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbb < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbb -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
@@ -15,6 +25,11 @@ 
# With Bitmanip permutation extension:

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbp -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbp -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbp < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbp -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbp < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbp -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
@@ -40,3 +55,6 @@ rori t0, t1, 31 
# CHECK-ASM-AND-OBJ: rori t0, t1, 0

# CHECK-ASM: encoding: [0x93,0x52,0x03,0x60]

rori t0, t1, 0

# CHECK-ASM-AND-OBJ: orc.b t0, t1

# CHECK-ASM: encoding: [0x93,0x52,0x73,0x28]

orc.b t0, t1

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

+10 −0
Original line number Diff line number Diff line 
# With B extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \

# RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# With Bitmanip carry-less multiply extension:

# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbc -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbc -show-encoding \

# RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbc < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbc -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s

# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbc < %s \

# RUN:     | llvm-objdump --mattr=+experimental-zbc -d -r - \

# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s



# CHECK-ASM-AND-OBJ: clmul t0, t1, t2

# CHECK-ASM: encoding: [0xb3,0x12,0x73,0x0a]