diff --git a/llvm/test/MC/RISCV/rv32zba-valid.s b/llvm/test/MC/RISCV/rv32zba-valid.s --- a/llvm/test/MC/RISCV/rv32zba-valid.s +++ b/llvm/test/MC/RISCV/rv32zba-valid.s @@ -1,16 +1,26 @@ # 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] diff --git a/llvm/test/MC/RISCV/rv32zbb-valid.s b/llvm/test/MC/RISCV/rv32zbb-valid.s --- a/llvm/test/MC/RISCV/rv32zbb-valid.s +++ b/llvm/test/MC/RISCV/rv32zbb-valid.s @@ -1,16 +1,26 @@ # 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 @@ # 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 diff --git a/llvm/test/MC/RISCV/rv32zbb-valid.s b/llvm/test/MC/RISCV/rv32zbbp-only-valid.s copy from llvm/test/MC/RISCV/rv32zbb-valid.s copy to llvm/test/MC/RISCV/rv32zbbp-only-valid.s --- a/llvm/test/MC/RISCV/rv32zbb-valid.s +++ b/llvm/test/MC/RISCV/rv32zbbp-only-valid.s @@ -12,39 +12,16 @@ # 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] -clz t0, t1 -# CHECK-ASM-AND-OBJ: ctz t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x13,0x60] -ctz t0, t1 -# CHECK-ASM-AND-OBJ: cpop t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x23,0x60] -cpop t0, t1 -# CHECK-ASM-AND-OBJ: sext.b t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x43,0x60] -sext.b t0, t1 -# CHECK-ASM-AND-OBJ: sext.h t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x53,0x60] -sext.h t0, t1 -# CHECK-ASM-AND-OBJ: min t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x42,0x73,0x0a] -min t0, t1, t2 -# CHECK-ASM-AND-OBJ: minu t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x0a] -minu t0, t1, t2 -# CHECK-ASM-AND-OBJ: max t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x62,0x73,0x0a] -max t0, t1, t2 -# CHECK-ASM-AND-OBJ: maxu t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x72,0x73,0x0a] -maxu t0, t1, t2 +# 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 -# CHECK-ASM-AND-OBJ: orc.b t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x73,0x28] -orc.b t0, t1 diff --git a/llvm/test/MC/RISCV/rv32zbbp-valid.s b/llvm/test/MC/RISCV/rv32zbbp-valid.s --- a/llvm/test/MC/RISCV/rv32zbbp-valid.s +++ b/llvm/test/MC/RISCV/rv32zbbp-valid.s @@ -1,6 +1,11 @@ # 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 @@ # 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 diff --git a/llvm/test/MC/RISCV/rv32zbc-valid.s b/llvm/test/MC/RISCV/rv32zbc-valid.s --- a/llvm/test/MC/RISCV/rv32zbc-valid.s +++ b/llvm/test/MC/RISCV/rv32zbc-valid.s @@ -1,16 +1,26 @@ # 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] diff --git a/llvm/test/MC/RISCV/rv32zbe-valid.s b/llvm/test/MC/RISCV/rv32zbe-valid.s --- a/llvm/test/MC/RISCV/rv32zbe-valid.s +++ b/llvm/test/MC/RISCV/rv32zbe-valid.s @@ -1,16 +1,26 @@ # 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 extract/deposit extension: # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbe -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbe -show-encoding \ +# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbe < %s \ # RUN: | llvm-objdump --mattr=+experimental-zbe -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbe < %s \ +# RUN: | llvm-objdump --mattr=+experimental-zbe -d -r - \ +# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: bdecompress t0, t1, t2 # CHECK-ASM: encoding: [0xb3,0x62,0x73,0x48] diff --git a/llvm/test/MC/RISCV/rv32zbf-valid.s b/llvm/test/MC/RISCV/rv32zbf-valid.s --- a/llvm/test/MC/RISCV/rv32zbf-valid.s +++ b/llvm/test/MC/RISCV/rv32zbf-valid.s @@ -1,16 +1,26 @@ # 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 Bit-Field extension: # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbf -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbf -show-encoding \ +# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbf < %s \ # RUN: | llvm-objdump --mattr=+experimental-zbf -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbf < %s \ +# RUN: | llvm-objdump --mattr=+experimental-zbf -d -r - \ +# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: bfp t0, t1, t2 # CHECK-ASM: encoding: [0xb3,0x72,0x73,0x48] diff --git a/llvm/test/MC/RISCV/rv32zbp-only-valid.s b/llvm/test/MC/RISCV/rv32zbp-only-valid.s new file mode 100644 --- /dev/null +++ b/llvm/test/MC/RISCV/rv32zbp-only-valid.s @@ -0,0 +1,22 @@ +# With B extension: +# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b -show-encoding \ +# RUN: | FileCheck -check-prefix=CHECK-ASM %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-OBJ %s + +# With Bitmanip permutation extension: +# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbp -show-encoding \ +# RUN: | FileCheck -check-prefix=CHECK-ASM %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-OBJ %s + +# CHECK-ASM: pack t0, t1, zero +# CHECK-OBJ: zext.h t0, t1 +# CHECK-ASM: encoding: [0xb3,0x42,0x03,0x08] +pack t0, t1, x0 +# CHECK-ASM: grevi t0, t1, 24 +# CHECK-OBJ: rev8 t0, t1 +# CHECK-ASM: encoding: [0x93,0x52,0x83,0x69] +grevi t0, t1, 24 diff --git a/llvm/test/MC/RISCV/rv32zbp-valid.s b/llvm/test/MC/RISCV/rv32zbp-valid.s --- a/llvm/test/MC/RISCV/rv32zbp-valid.s +++ b/llvm/test/MC/RISCV/rv32zbp-valid.s @@ -1,16 +1,26 @@ # 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-prefixes=CHECK-OBJ,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-prefixes=CHECK-OBJ,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 %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=riscv32 -mattr=+experimental-zbp < %s \ # RUN: | llvm-objdump --mattr=+experimental-zbp -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-OBJ,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-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: slo t0, t1, t2 # CHECK-ASM: encoding: [0xb3,0x12,0x73,0x20] @@ -57,23 +67,6 @@ # CHECK-ASM-AND-OBJ: packh t0, t1, t2 # CHECK-ASM: encoding: [0xb3,0x72,0x73,0x08] packh t0, t1, t2 -# CHECK-ASM-AND-OBJ: zext.h t0, t1 -# CHECK-ASM: encoding: [0xb3,0x42,0x03,0x08] -zext.h t0, t1 -# CHECK-ASM: pack t0, t1, zero -# CHECK-OBJ: zext.h t0, t1 -# CHECK-ASM: encoding: [0xb3,0x42,0x03,0x08] -pack t0, t1, x0 -# CHECK-ASM-AND-OBJ: rev8 t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x83,0x69] -rev8 t0, t1 -# CHECK-ASM: grevi t0, t1, 24 -# CHECK-OBJ: rev8 t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x83,0x69] -grevi t0, t1, 24 -# CHECK-ASM-AND-OBJ: orc.b t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x73,0x28] -orc.b t0, t1 # CHECK-ASM: gorci t0, t1, 7 # CHECK-OBJ: orc.b t0, t1 # CHECK-ASM: encoding: [0x93,0x52,0x73,0x28] diff --git a/llvm/test/MC/RISCV/rv32zbproposedc-valid.s b/llvm/test/MC/RISCV/rv32zbproposedc-valid.s --- a/llvm/test/MC/RISCV/rv32zbproposedc-valid.s +++ b/llvm/test/MC/RISCV/rv32zbproposedc-valid.s @@ -1,8 +1,13 @@ # RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+experimental-zbproposedc -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -riscv-no-aliases -show-encoding \ +# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c,+experimental-zbproposedc < %s \ # RUN: | llvm-objdump --mattr=+c,+experimental-zbproposedc -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b < %s \ +# RUN: | llvm-objdump --mattr=+c,+experimental-zbproposedc,+experimental-b -M no-aliases -d -r - \ +# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: c.not s0 # CHECK-ASM: encoding: [0x01,0x60] diff --git a/llvm/test/MC/RISCV/rv32zbs-valid.s b/llvm/test/MC/RISCV/rv32zbs-valid.s --- a/llvm/test/MC/RISCV/rv32zbs-valid.s +++ b/llvm/test/MC/RISCV/rv32zbs-valid.s @@ -1,16 +1,26 @@ # 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 single bit extension: # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbs -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbs -show-encoding \ +# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbs < %s \ # RUN: | llvm-objdump --mattr=+experimental-zbs -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbs < %s \ +# RUN: | llvm-objdump --mattr=+experimental-zbs -d -r - \ +# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: bclr t0, t1, t2 # CHECK-ASM: encoding: [0xb3,0x12,0x73,0x48] diff --git a/llvm/test/MC/RISCV/rv32zbt-valid.s b/llvm/test/MC/RISCV/rv32zbt-valid.s --- a/llvm/test/MC/RISCV/rv32zbt-valid.s +++ b/llvm/test/MC/RISCV/rv32zbt-valid.s @@ -1,16 +1,26 @@ # 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 ternary extension: # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbt -show-encoding \ # 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-objdump --mattr=+experimental-zbt -d -r - \ # 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: encoding: [0xb3,0x92,0x63,0xe6] diff --git a/llvm/test/MC/RISCV/rv64zba-valid.s b/llvm/test/MC/RISCV/rv64zba-valid.s --- a/llvm/test/MC/RISCV/rv64zba-valid.s +++ b/llvm/test/MC/RISCV/rv64zba-valid.s @@ -27,12 +27,3 @@ # CHECK-ASM-AND-OBJ: sh3add.uw t0, t1, t2 # CHECK-ASM: encoding: [0xbb,0x62,0x73,0x20] sh3add.uw t0, t1, t2 -# CHECK-ASM-AND-OBJ: sh1add t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x22,0x73,0x20] -sh1add t0, t1, t2 -# CHECK-ASM-AND-OBJ: sh2add t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x42,0x73,0x20] -sh2add t0, t1, t2 -# CHECK-ASM-AND-OBJ: sh3add t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x62,0x73,0x20] -sh3add t0, t1, t2 diff --git a/llvm/test/MC/RISCV/rv64zbb-valid.s b/llvm/test/MC/RISCV/rv64zbb-valid.s --- a/llvm/test/MC/RISCV/rv64zbb-valid.s +++ b/llvm/test/MC/RISCV/rv64zbb-valid.s @@ -12,33 +12,6 @@ # 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] -clz t0, t1 -# CHECK-ASM-AND-OBJ: ctz t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x13,0x60] -ctz t0, t1 -# CHECK-ASM-AND-OBJ: cpop t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x23,0x60] -cpop t0, t1 -# CHECK-ASM-AND-OBJ: sext.b t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x43,0x60] -sext.b t0, t1 -# CHECK-ASM-AND-OBJ: sext.h t0, t1 -# CHECK-ASM: encoding: [0x93,0x12,0x53,0x60] -sext.h t0, t1 -# CHECK-ASM-AND-OBJ: min t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x42,0x73,0x0a] -min t0, t1, t2 -# CHECK-ASM-AND-OBJ: minu t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x0a] -minu t0, t1, t2 -# CHECK-ASM-AND-OBJ: max t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x62,0x73,0x0a] -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: clzw t0, t1 # CHECK-ASM: encoding: [0x9b,0x12,0x03,0x60] clzw t0, t1 @@ -48,12 +21,3 @@ # CHECK-ASM-AND-OBJ: cpopw t0, t1 # CHECK-ASM: encoding: [0x9b,0x12,0x23,0x60] cpopw t0, t1 -# CHECK-ASM-AND-OBJ: zext.h t0, t1 -# CHECK-ASM: encoding: [0xbb,0x42,0x03,0x08] -zext.h t0, t1 -# CHECK-ASM-AND-OBJ: rev8 t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x83,0x6b] -rev8 t0, t1 -# CHECK-ASM-AND-OBJ: orc.b t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x73,0x28] -orc.b t0, t1 diff --git a/llvm/test/MC/RISCV/rv64zbbp-valid.s b/llvm/test/MC/RISCV/rv64zbbp-valid.s --- a/llvm/test/MC/RISCV/rv64zbbp-valid.s +++ b/llvm/test/MC/RISCV/rv64zbbp-valid.s @@ -19,27 +19,6 @@ # RUN: | llvm-objdump --mattr=+experimental-zbp -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# CHECK-ASM-AND-OBJ: andn t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x72,0x73,0x40] -andn t0, t1, t2 -# CHECK-ASM-AND-OBJ: orn t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x62,0x73,0x40] -orn t0, t1, t2 -# CHECK-ASM-AND-OBJ: xnor t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x42,0x73,0x40] -xnor t0, t1, t2 -# CHECK-ASM-AND-OBJ: rol t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x12,0x73,0x60] -rol t0, t1, t2 -# CHECK-ASM-AND-OBJ: ror t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x60] -ror t0, t1, t2 -# CHECK-ASM-AND-OBJ: rori t0, t1, 31 -# CHECK-ASM: encoding: [0x93,0x52,0xf3,0x61] -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: rolw t0, t1, t2 # CHECK-ASM: encoding: [0xbb,0x12,0x73,0x60] rolw t0, t1, t2 @@ -52,3 +31,9 @@ # CHECK-ASM-AND-OBJ: roriw t0, t1, 0 # CHECK-ASM: encoding: [0x9b,0x52,0x03,0x60] roriw t0, t1, 0 +# CHECK-ASM-AND-OBJ: zext.h t0, t1 +# CHECK-ASM: encoding: [0xbb,0x42,0x03,0x08] +zext.h t0, t1 +# CHECK-ASM-AND-OBJ: rev8 t0, t1 +# CHECK-ASM: encoding: [0x93,0x52,0x83,0x6b] +rev8 t0, t1 diff --git a/llvm/test/MC/RISCV/rv64zbc-valid.s b/llvm/test/MC/RISCV/rv64zbc-valid.s deleted file mode 100644 --- a/llvm/test/MC/RISCV/rv64zbc-valid.s +++ /dev/null @@ -1,23 +0,0 @@ -# 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 -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=riscv64 -mattr=+experimental-zbc -show-encoding \ -# RUN: | FileCheck -check-prefixes=CHECK-ASM,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] -clmul t0, t1, t2 -# CHECK-ASM-AND-OBJ: clmulr t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x22,0x73,0x0a] -clmulr t0, t1, t2 -# CHECK-ASM-AND-OBJ: clmulh t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x32,0x73,0x0a] -clmulh t0, t1, t2 diff --git a/llvm/test/MC/RISCV/rv64zbe-valid.s b/llvm/test/MC/RISCV/rv64zbe-valid.s --- a/llvm/test/MC/RISCV/rv64zbe-valid.s +++ b/llvm/test/MC/RISCV/rv64zbe-valid.s @@ -12,12 +12,6 @@ # RUN: | llvm-objdump --mattr=+experimental-zbe -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# CHECK-ASM-AND-OBJ: bdecompress t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x62,0x73,0x48] -bdecompress t0, t1, t2 -# CHECK-ASM-AND-OBJ: bcompress t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x62,0x73,0x08] -bcompress t0, t1, t2 # CHECK-ASM-AND-OBJ: bdecompressw t0, t1, t2 # CHECK-ASM: encoding: [0xbb,0x62,0x73,0x48] bdecompressw t0, t1, t2 diff --git a/llvm/test/MC/RISCV/rv64zbf-valid.s b/llvm/test/MC/RISCV/rv64zbf-valid.s --- a/llvm/test/MC/RISCV/rv64zbf-valid.s +++ b/llvm/test/MC/RISCV/rv64zbf-valid.s @@ -12,9 +12,6 @@ # RUN: | llvm-objdump --mattr=+experimental-zbf -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# CHECK-ASM-AND-OBJ: bfp t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x72,0x73,0x48] -bfp t0, t1, t2 # CHECK-ASM-AND-OBJ: bfpw t0, t1, t2 # CHECK-ASM: encoding: [0xbb,0x72,0x73,0x48] bfpw t0, t1, t2 diff --git a/llvm/test/MC/RISCV/rv64zbp-valid.s b/llvm/test/MC/RISCV/rv64zbp-valid.s --- a/llvm/test/MC/RISCV/rv64zbp-valid.s +++ b/llvm/test/MC/RISCV/rv64zbp-valid.s @@ -12,51 +12,6 @@ # RUN: | llvm-objdump --mattr=+experimental-zbp -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s -# CHECK-ASM-AND-OBJ: slo t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x12,0x73,0x20] -slo t0, t1, t2 -# CHECK-ASM-AND-OBJ: sro t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x20] -sro t0, t1, t2 -# CHECK-ASM-AND-OBJ: sloi t0, t1, 0 -# CHECK-ASM: encoding: [0x93,0x12,0x03,0x20] -sloi t0, t1, 0 -# CHECK-ASM-AND-OBJ: sroi t0, t1, 0 -# CHECK-ASM: encoding: [0x93,0x52,0x03,0x20] -sroi t0, t1, 0 -# CHECK-ASM-AND-OBJ: gorc t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x28] -gorc t0, t1, t2 -# CHECK-ASM-AND-OBJ: grev t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x68] -grev t0, t1, t2 -# CHECK-ASM-AND-OBJ: gorci t0, t1, 0 -# CHECK-ASM: encoding: [0x93,0x52,0x03,0x28] -gorci t0, t1, 0 -# CHECK-ASM-AND-OBJ: grevi t0, t1, 0 -# CHECK-ASM: encoding: [0x93,0x52,0x03,0x68] -grevi t0, t1, 0 -# CHECK-ASM-AND-OBJ: shfl t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x12,0x73,0x08] -shfl t0, t1, t2 -# CHECK-ASM-AND-OBJ: unshfl t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x08] -unshfl t0, t1, t2 -# CHECK-ASM-AND-OBJ: shfli t0, t1, 0 -# CHECK-ASM: encoding: [0x93,0x12,0x03,0x08] -shfli t0, t1, 0 -# CHECK-ASM-AND-OBJ: unshfli t0, t1, 0 -# CHECK-ASM: encoding: [0x93,0x52,0x03,0x08] -unshfli t0, t1, 0 -# CHECK-ASM-AND-OBJ: pack t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x42,0x73,0x08] -pack t0, t1, t2 -# CHECK-ASM-AND-OBJ: packu t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x42,0x73,0x48] -packu t0, t1, t2 -# CHECK-ASM-AND-OBJ: packh t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x72,0x73,0x08] -packh t0, t1, t2 # CHECK-ASM-AND-OBJ: slow t0, t1, t2 # CHECK-ASM: encoding: [0xbb,0x12,0x73,0x20] slow t0, t1, t2 @@ -93,36 +48,14 @@ # CHECK-ASM-AND-OBJ: packuw t0, t1, t2 # CHECK-ASM: encoding: [0xbb,0x42,0x73,0x48] packuw t0, t1, t2 -# CHECK-ASM-AND-OBJ: zext.h t0, t1 -# CHECK-ASM: encoding: [0xbb,0x42,0x03,0x08] -zext.h t0, t1 # CHECK-ASM: packw t0, t1, zero # CHECK-OBJ: zext.h t0, t1 # CHECK-ASM: encoding: [0xbb,0x42,0x03,0x08] packw t0, t1, x0 -# CHECK-ASM-AND-OBJ: rev8 t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x83,0x6b] -rev8 t0, t1 # CHECK-ASM: grevi t0, t1, 56 # CHECK-OBJ: rev8 t0, t1 # CHECK-ASM: encoding: [0x93,0x52,0x83,0x6b] grevi t0, t1, 56 -# CHECK-ASM-AND-OBJ: orc.b t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x73,0x28] -orc.b t0, t1 -# CHECK-ASM: gorci t0, t1, 7 -# CHECK-OBJ: orc.b t0, t1 -# CHECK-ASM: encoding: [0x93,0x52,0x73,0x28] -gorci t0, t1, 7 -# CHECK-ASM-AND-OBJ: xperm.n t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x22,0x73,0x28] -xperm.n t0, t1, t2 -# CHECK-ASM-AND-OBJ: xperm.b t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x42,0x73,0x28] -xperm.b t0, t1, t2 -# CHECK-ASM-AND-OBJ: xperm.h t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x62,0x73,0x28 -xperm.h t0, t1, t2 # CHECK-ASM-AND-OBJ: xperm.w t0, t1, t2 # CHECK-ASM: encoding: [0xb3,0x02,0x73,0x28] xperm.w t0, t1, t2 diff --git a/llvm/test/MC/RISCV/rv64zbproposedc-valid.s b/llvm/test/MC/RISCV/rv64zbproposedc-valid.s --- a/llvm/test/MC/RISCV/rv64zbproposedc-valid.s +++ b/llvm/test/MC/RISCV/rv64zbproposedc-valid.s @@ -5,12 +5,6 @@ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# CHECK-ASM-AND-OBJ: c.not s0 -# CHECK-ASM: encoding: [0x01,0x60] -c.not s0 -# CHECK-ASM-AND-OBJ: c.neg s0 -# CHECK-ASM: encoding: [0x01,0x64] -c.neg s0 # CHECK-ASM-AND-OBJ: c.zext.w s0 # CHECK-ASM: encoding: [0x01,0x68] c.zext.w s0 diff --git a/llvm/test/MC/RISCV/rv64zbs-valid.s b/llvm/test/MC/RISCV/rv64zbs-valid.s --- a/llvm/test/MC/RISCV/rv64zbs-valid.s +++ b/llvm/test/MC/RISCV/rv64zbs-valid.s @@ -12,30 +12,6 @@ # RUN: | llvm-objdump --mattr=+experimental-zbs -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# CHECK-ASM-AND-OBJ: bclr t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x12,0x73,0x48] -bclr t0, t1, t2 -# CHECK-ASM-AND-OBJ: bset t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x12,0x73,0x28] -bset t0, t1, t2 -# CHECK-ASM-AND-OBJ: binv t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x12,0x73,0x68] -binv t0, t1, t2 -# CHECK-ASM-AND-OBJ: bext t0, t1, t2 -# CHECK-ASM: encoding: [0xb3,0x52,0x73,0x48] -bext t0, t1, t2 -# CHECK-ASM-AND-OBJ: bclri t0, t1, 1 -# CHECK-ASM: encoding: [0x93,0x12,0x13,0x48] -bclri t0, t1, 1 -# CHECK-ASM-AND-OBJ: bseti t0, t1, 1 -# CHECK-ASM: encoding: [0x93,0x12,0x13,0x28] -bseti t0, t1, 1 -# CHECK-ASM-AND-OBJ: binvi t0, t1, 1 -# CHECK-ASM: encoding: [0x93,0x12,0x13,0x68] -binvi t0, t1, 1 -# CHECK-ASM-AND-OBJ: bexti t0, t1, 1 -# CHECK-ASM: encoding: [0x93,0x52,0x13,0x48] -bexti t0, t1, 1 # CHECK-ASM-AND-OBJ: bclrw t0, t1, t2 # CHECK-ASM: encoding: [0xbb,0x12,0x73,0x48] bclrw t0, t1, t2 diff --git a/llvm/test/MC/RISCV/rv64zbt-valid.s b/llvm/test/MC/RISCV/rv64zbt-valid.s --- a/llvm/test/MC/RISCV/rv64zbt-valid.s +++ b/llvm/test/MC/RISCV/rv64zbt-valid.s @@ -12,21 +12,6 @@ # 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: 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: encoding: [0xbb,0x12,0xc3,0x3d] fslw t0, t1, t2, t3