From e25377ab89d6c767d9b7947831a967bbbb93dc92 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sat, 1 Jan 2022 16:55:10 -0800
Subject: fix test expectations
---
test/armv8/a64.rs | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
(limited to 'test')
diff --git a/test/armv8/a64.rs b/test/armv8/a64.rs
index 1dea7e1..19256d1 100644
--- a/test/armv8/a64.rs
+++ b/test/armv8/a64.rs
@@ -1403,7 +1403,7 @@ fn test_decode_chrome_entrypoint() {
);
test_display(
[0xdf, 0x6a, 0x35, 0x38],
- "strb wzr, [x22, x21, lsl #0]"
+ "strb wzr, [x22, x21]"
);
test_display(
[0xe0, 0x03, 0x00, 0x32],
@@ -2942,13 +2942,13 @@ fn test_openblas_simd_loadstore() {
([0xc3, 0x83, 0x1f, 0xfc], "stur d3, [x30, #-0x8]"),
([0x0d, 0x84, 0x1f, 0xfc], "str d13, [x0], #-0x8"),
([0x61, 0x8e, 0x1f, 0xfc], "str d1, [x19, #-0x8]!"),
- ([0xa3, 0x68, 0x20, 0xfc], "str d3, [x5, x0, lsl #0]"),
- ([0xd2, 0x68, 0x20, 0xfc], "str d18, [x6, x0, lsl #0]"),
- ([0x94, 0x6b, 0x20, 0xfc], "str d20, [x28, x0, lsl #0]"),
+ ([0xa3, 0x68, 0x20, 0xfc], "str d3, [x5, x0]"),
+ ([0xd2, 0x68, 0x20, 0xfc], "str d18, [x6, x0]"),
+ ([0x94, 0x6b, 0x20, 0xfc], "str d20, [x28, x0]"),
([0x48, 0x78, 0x20, 0xfc], "str d8, [x2, x0, lsl #3]"),
([0x83, 0x7b, 0x77, 0xfc], "ldr d3, [x28, x23, lsl #3]"),
([0x80, 0xda, 0x77, 0xfc], "ldr d0, [x20, w23, sxtw #3]"),
- ([0x22, 0x6b, 0x78, 0xfc], "ldr d2, [x25, x24, lsl #0]"),
+ ([0x22, 0x6b, 0x78, 0xfc], "ldr d2, [x25, x24]"),
([0x08, 0x78, 0x78, 0xfc], "ldr d8, [x0, x24, lsl #3]"),
([0xf3, 0x9b, 0x41, 0xfd], "ldr d19, [sp, #0x330]"),
([0x4a, 0x44, 0x47, 0xfd], "ldr d10, [x2, #0xe88]"),
@@ -2973,7 +2973,7 @@ fn test_openblas_simd_loadstore() {
([0x8d, 0xc3, 0x1f, 0xbc], "stur s13, [x28, #-0x4]"),
([0x0d, 0xc4, 0x1f, 0xbc], "str s13, [x0], #-0x4"),
([0x61, 0xce, 0x1f, 0xbc], "str s1, [x19, #-0x4]!"),
- ([0x82, 0x6b, 0x20, 0xbc], "str s2, [x28, x0, lsl #0]"),
+ ([0x82, 0x6b, 0x20, 0xbc], "str s2, [x28, x0]"),
([0xad, 0x7a, 0x20, 0xbc], "str s13, [x21, x0, lsl #2]"),
([0x88, 0x7b, 0x21, 0xbc], "str s8, [x28, x1, lsl #2]"),
([0x60, 0xda, 0x21, 0xbc], "str s0, [x19, w1, sxtw #2]"),
@@ -2986,7 +2986,7 @@ fn test_openblas_simd_loadstore() {
([0x21, 0x84, 0x5f, 0xbc], "ldr s1, [x1], #-0x8"),
([0x22, 0x87, 0x5f, 0xbc], "ldr s2, [x25], #-0x8"),
([0xe0, 0x8e, 0x5f, 0xbc], "ldr s0, [x23, #-0x8]!"),
- ([0x79, 0x6a, 0x60, 0xbc], "ldr s25, [x19, x0, lsl #0]"),
+ ([0x79, 0x6a, 0x60, 0xbc], "ldr s25, [x19, x0]"),
([0x6a, 0x78, 0x60, 0xbc], "ldr s10, [x3, x0, lsl #2]"),
([0xeb, 0x7a, 0x60, 0xbc], "ldr s11, [x23, x0, lsl #2]"),
([0x96, 0x7b, 0x61, 0xbc], "ldr s22, [x28, x1, lsl #2]"),
@@ -3015,7 +3015,7 @@ fn test_openblas_simd_loadstore() {
#[test]
fn test_openblas_loadstore() {
const TESTS: &[([u8; 4], &'static str)] = &[
- ([0x83, 0x68, 0x60, 0x38], "ldrb w3, [x4, x0, lsl #0]"),
+ ([0x83, 0x68, 0x60, 0x38], "ldrb w3, [x4, x0]"),
([0x63, 0x03, 0x40, 0x29], "ldp w3, w0, [x27]"),
([0x49, 0x00, 0x40, 0x39], "ldrb w9, [x2]"),
([0x4a, 0x00, 0x40, 0x39], "ldrb w10, [x2]"),
@@ -3096,25 +3096,25 @@ fn test_openblas_loadstore() {
([0x1f, 0xc0, 0x11, 0xb8], "stur wzr, [x0, #-0xe4]"),
([0xff, 0x82, 0x14, 0xb8], "stur wzr, [x23, #-0xb8]"),
([0x0b, 0x83, 0x14, 0xb8], "stur w11, [x24, #-0xb8]"),
- ([0xff, 0x69, 0x20, 0xb8], "str wzr, [x15, x0, lsl #0]"),
+ ([0xff, 0x69, 0x20, 0xb8], "str wzr, [x15, x0]"),
([0x57, 0x78, 0x20, 0xb8], "str w23, [x2, x0, lsl #2]"),
- ([0x7f, 0x68, 0x21, 0xb8], "str wzr, [x3, x1, lsl #0]"),
- ([0xa8, 0x68, 0x21, 0xb8], "str w8, [x5, x1, lsl #0]"),
+ ([0x7f, 0x68, 0x21, 0xb8], "str wzr, [x3, x1]"),
+ ([0xa8, 0x68, 0x21, 0xb8], "str w8, [x5, x1]"),
([0xe0, 0xda, 0x34, 0xb8], "str w0, [x23, w20, sxtw #2]"),
([0x48, 0x7b, 0x35, 0xb8], "str w8, [x26, x21, lsl #2]"),
([0x23, 0x44, 0x40, 0xb8], "ldr w3, [x1], #0x4"),
([0xe1, 0x13, 0x45, 0xb8], "ldur w1, [sp, #0x51]"),
([0xe2, 0xf3, 0x48, 0xb8], "ldur w2, [sp, #0x8f]"),
([0x27, 0x80, 0x5f, 0xb8], "ldur w7, [x1, #-0x8]"),
- ([0xe3, 0x68, 0x61, 0xb8], "ldr w3, [x7, x1, lsl #0]"),
+ ([0xe3, 0x68, 0x61, 0xb8], "ldr w3, [x7, x1]"),
([0x0e, 0x79, 0x61, 0xb8], "ldr w14, [x8, x1, lsl #2]"),
- ([0xf2, 0x6a, 0x62, 0xb8], "ldr w18, [x23, x2, lsl #0]"),
+ ([0xf2, 0x6a, 0x62, 0xb8], "ldr w18, [x23, x2]"),
([0x63, 0x7b, 0x7c, 0xb8], "ldr w3, [x27, x28, lsl #2]"),
([0xe5, 0x44, 0x80, 0xb8], "ldrsw x5, [x7], #0x4"),
([0xa3, 0xc0, 0x9f, 0xb8], "ldursw x3, [x5, #-0x4]"),
([0x04, 0x78, 0xa2, 0xb8], "ldrsw x4, [x0, x2, lsl #2]"),
- ([0xe4, 0x68, 0xa3, 0xb8], "ldrsw x4, [x7, x3, lsl #0]"),
- ([0xe5, 0x6a, 0xb3, 0xb8], "ldrsw x5, [x23, x19, lsl #0]"),
+ ([0xe4, 0x68, 0xa3, 0xb8], "ldrsw x4, [x7, x3]"),
+ ([0xe5, 0x6a, 0xb3, 0xb8], "ldrsw x5, [x23, x19]"),
([0x65, 0x02, 0x00, 0xb9], "str w5, [x19]"),
([0xff, 0x03, 0x00, 0xb9], "str wzr, [sp]"),
([0xe9, 0x23, 0x00, 0xb9], "str w9, [sp, #0x20]"),
@@ -3165,15 +3165,15 @@ fn test_openblas_loadstore() {
([0xc3, 0x00, 0x1c, 0xf8], "stur x3, [x6, #-0x40]"),
([0x02, 0x87, 0x1f, 0xf8], "str x2, [x24], #-0x8"),
([0x1f, 0xc3, 0x1f, 0xf8], "stur xzr, [x24, #-0x4]"),
- ([0xbf, 0x68, 0x20, 0xf8], "str xzr, [x5, x0, lsl #0]"),
- ([0xff, 0x6a, 0x38, 0xf8], "str xzr, [x23, x24, lsl #0]"),
+ ([0xbf, 0x68, 0x20, 0xf8], "str xzr, [x5, x0]"),
+ ([0xff, 0x6a, 0x38, 0xf8], "str xzr, [x23, x24]"),
([0x7f, 0x7b, 0x3c, 0xf8], "str xzr, [x27, x28, lsl #3]"),
([0xc7, 0x40, 0x40, 0xf8], "ldur x7, [x6, #0x4]"),
([0x01, 0x87, 0x40, 0xf8], "ldr x1, [x24], #0x8"),
([0x98, 0x83, 0x5f, 0xf8], "ldur x24, [x28, #-0x8]"),
([0x80, 0x86, 0x5f, 0xf8], "ldr x0, [x20], #-0x8"),
- ([0xe3, 0x6a, 0x60, 0xf8], "ldr x3, [x23, x0, lsl #0]"),
- ([0xc5, 0x6a, 0x7b, 0xf8], "ldr x5, [x22, x27, lsl #0]"),
+ ([0xe3, 0x6a, 0x60, 0xf8], "ldr x3, [x23, x0]"),
+ ([0xc5, 0x6a, 0x7b, 0xf8], "ldr x5, [x22, x27]"),
([0xa0, 0x7a, 0x7c, 0xf8], "ldr x0, [x21, x28, lsl #3]"),
([0x08, 0xdb, 0x7c, 0xf8], "ldr x8, [x24, w28, sxtw #3]"),
([0x5f, 0x00, 0x00, 0xf9], "str xzr, [x2]"),
--
cgit v1.1