Fix test expectations

prtest:full
bytecodealliance · Dec 10, 2024 · 8a86ad3 · 8a86ad3
1 parent 6e45fe1
commit 8a86ad3
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 77 deletions.
diff --git a/cranelift/filetests/filetests/isa/pulley32/brif.clif b/cranelift/filetests/filetests/isa/pulley32/brif.clif
@@ -16,7 +16,8 @@ block2:
 
 ; VCode:
 ; block0:
-;   br_if x0, label2; jump label1
+;   zext8 x4, x0
+;   br_if x4, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -25,7 +26,8 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; br_if x0, 0xa    // target = 0xa
+; zext8 x4, x0
+; br_if x4, 0xa    // target = 0xd
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -46,7 +48,8 @@ block2:
 
 ; VCode:
 ; block0:
-;   br_if x0, label2; jump label1
+;   zext16 x4, x0
+;   br_if x4, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -55,7 +58,8 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; br_if x0, 0xa    // target = 0xa
+; zext16 x4, x0
+; br_if x4, 0xa    // target = 0xd
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -76,7 +80,8 @@ block2:
 
 ; VCode:
 ; block0:
-;   br_if x0, label2; jump label1
+;   zext32 x4, x0
+;   br_if x4, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -85,7 +90,8 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; br_if x0, 0xa    // target = 0xa
+; zext32 x4, x0
+; br_if x4, 0xa    // target = 0xd
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -137,8 +143,9 @@ block2:
 
 ; VCode:
 ; block0:
-;   xeq32 x5, x0, x1
-;   br_if x5, label2; jump label1
+;   xeq32 x6, x0, x1
+;   zext8 x6, x6
+;   br_if x6, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -147,8 +154,9 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; xeq32 x5, x0, x1
-; br_if x5, 0xa    // target = 0xd
+; xeq32 x6, x0, x1
+; zext8 x6, x6
+; br_if x6, 0xa    // target = 0x10
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -170,8 +178,9 @@ block2:
 
 ; VCode:
 ; block0:
-;   xneq32 x5, x0, x1
-;   br_if x5, label2; jump label1
+;   xneq32 x6, x0, x1
+;   zext8 x6, x6
+;   br_if x6, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -180,8 +189,9 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; xneq32 x5, x0, x1
-; br_if x5, 0xa    // target = 0xd
+; xneq32 x6, x0, x1
+; zext8 x6, x6
+; br_if x6, 0xa    // target = 0x10
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -234,8 +244,9 @@ block2:
 
 ; VCode:
 ; block0:
-;   xulteq64 x5, x1, x0
-;   br_if x5, label2; jump label1
+;   xulteq64 x6, x1, x0
+;   zext8 x6, x6
+;   br_if x6, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -244,8 +255,9 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; xulteq64 x5, x1, x0
-; br_if x5, 0xa    // target = 0xd
+; xulteq64 x6, x1, x0
+; zext8 x6, x6
+; br_if x6, 0xa    // target = 0x10
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1

diff --git a/cranelift/filetests/filetests/isa/pulley32/call.clif b/cranelift/filetests/filetests/isa/pulley32/call.clif
@@ -227,9 +227,14 @@ block0:
 
 ; VCode:
 ;   push_frame
-;   stack_alloc32 64
-;   xstore64 sp+56, x18 // flags =  notrap aligned
-;   xstore64 sp+48, x20 // flags =  notrap aligned
+;   stack_alloc32 112
+;   xstore64 sp+104, x18 // flags =  notrap aligned
+;   xstore64 sp+96, x19 // flags =  notrap aligned
+;   xstore64 sp+88, x20 // flags =  notrap aligned
+;   xstore64 sp+80, x21 // flags =  notrap aligned
+;   xstore64 sp+72, x23 // flags =  notrap aligned
+;   xstore64 sp+64, x24 // flags =  notrap aligned
+;   xstore64 sp+56, x25 // flags =  notrap aligned
 ; block0:
 ;   x0 = load_addr OutgoingArg(0)
 ;   call CallInfo { dest: TestCase(%g), uses: [CallArgPair { vreg: p0i, preg: p0i }], defs: [CallRetPair { vreg: Writable { reg: p0i }, preg: p0i }, CallRetPair { vreg: Writable { reg: p1i }, preg: p1i }, CallRetPair { vreg: Writable { reg: p2i }, preg: p2i }, CallRetPair { vreg: Writable { reg: p3i }, preg: p3i }, CallRetPair { vreg: Writable { reg: p4i }, preg: p4i }, CallRetPair { vreg: Writable { reg: p5i }, preg: p5i }, CallRetPair { vreg: Writable { reg: p6i }, preg: p6i }, CallRetPair { vreg: Writable { reg: p7i }, preg: p7i }, CallRetPair { vreg: Writable { reg: p8i }, preg: p8i }, CallRetPair { vreg: Writable { reg: p9i }, preg: p9i }, CallRetPair { vreg: Writable { reg: p10i }, preg: p10i }, CallRetPair { vreg: Writable { reg: p11i }, preg: p11i }, CallRetPair { vreg: Writable { reg: p12i }, preg: p12i }, CallRetPair { vreg: Writable { reg: p13i }, preg: p13i }, CallRetPair { vreg: Writable { reg: p14i }, preg: p14i }, CallRetPair { vreg: Writable { reg: p15i }, preg: p15i }], clobbers: PRegSet { bits: [0, 65279, 4294967295, 0] }, callee_conv: Fast, caller_conv: Fast, callee_pop_size: 0 }
@@ -265,19 +270,29 @@ block0:
 ;   xadd64 x14, x0, x14
 ;   xadd64 x13, x13, x13
 ;   xadd64 x0, x14, x13
-;   x18 = xload64 sp+56 // flags = notrap aligned
-;   x20 = xload64 sp+48 // flags = notrap aligned
-;   stack_free32 64
+;   x18 = xload64 sp+104 // flags = notrap aligned
+;   x19 = xload64 sp+96 // flags = notrap aligned
+;   x20 = xload64 sp+88 // flags = notrap aligned
+;   x21 = xload64 sp+80 // flags = notrap aligned
+;   x23 = xload64 sp+72 // flags = notrap aligned
+;   x24 = xload64 sp+64 // flags = notrap aligned
+;   x25 = xload64 sp+56 // flags = notrap aligned
+;   stack_free32 112
 ;   pop_frame
 ;   ret
 ;
 ; Disassembled:
 ; push_frame
-; stack_alloc32 64
-; xstore64le_offset32 sp, 56, x18
-; xstore64le_offset32 sp, 48, x20
+; stack_alloc32 112
+; xstore64le_offset32 sp, 104, x18
+; xstore64le_offset32 sp, 96, x19
+; xstore64le_offset32 sp, 88, x20
+; xstore64le_offset32 sp, 80, x21
+; xstore64le_offset32 sp, 72, x23
+; xstore64le_offset32 sp, 64, x24
+; xstore64le_offset32 sp, 56, x25
 ; xmov x0, sp
-; call 0x0    // target = 0x17
+; call 0x0    // target = 0x3a
 ; xmov x18, x13
 ; xmov x20, x11
 ; xload64le_offset32 x24, sp, 0
@@ -310,9 +325,14 @@ block0:
 ; xadd64 x14, x0, x14
 ; xadd64 x13, x13, x13
 ; xadd64 x0, x14, x13
-; xload64le_offset32 x18, sp, 56
-; xload64le_offset32 x20, sp, 48
-; stack_free32 64
+; xload64le_offset32 x18, sp, 104
+; xload64le_offset32 x19, sp, 96
+; xload64le_offset32 x20, sp, 88
+; xload64le_offset32 x21, sp, 80
+; xload64le_offset32 x23, sp, 72
+; xload64le_offset32 x24, sp, 64
+; xload64le_offset32 x25, sp, 56
+; stack_free32 112
 ; pop_frame
 ; ret
 

diff --git a/cranelift/filetests/filetests/isa/pulley32/jump.clif b/cranelift/filetests/filetests/isa/pulley32/jump.clif
@@ -19,7 +19,8 @@ block3(v3: i8):
 
 ; VCode:
 ; block0:
-;   br_if x0, label2; jump label1
+;   zext8 x5, x0
+;   br_if x5, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   jump label3
@@ -30,9 +31,10 @@ block3(v3: i8):
 ;   ret
 ;
 ; Disassembled:
-; br_if x0, 0xe    // target = 0xe
+; zext8 x5, x0
+; br_if x5, 0xe    // target = 0x11
 ; xconst8 x0, 0
-; jump 0x8    // target = 0x11
+; jump 0x8    // target = 0x14
 ; xconst8 x0, 1
 ; ret
 
diff --git a/cranelift/filetests/filetests/isa/pulley64/brif.clif b/cranelift/filetests/filetests/isa/pulley64/brif.clif
@@ -16,7 +16,8 @@ block2:
 
 ; VCode:
 ; block0:
-;   br_if x0, label2; jump label1
+;   zext8 x4, x0
+;   br_if x4, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -25,7 +26,8 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; br_if x0, 0xa    // target = 0xa
+; zext8 x4, x0
+; br_if x4, 0xa    // target = 0xd
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -46,7 +48,8 @@ block2:
 
 ; VCode:
 ; block0:
-;   br_if x0, label2; jump label1
+;   zext16 x4, x0
+;   br_if x4, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -55,7 +58,8 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; br_if x0, 0xa    // target = 0xa
+; zext16 x4, x0
+; br_if x4, 0xa    // target = 0xd
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -76,7 +80,8 @@ block2:
 
 ; VCode:
 ; block0:
-;   br_if x0, label2; jump label1
+;   zext32 x4, x0
+;   br_if x4, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -85,7 +90,8 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; br_if x0, 0xa    // target = 0xa
+; zext32 x4, x0
+; br_if x4, 0xa    // target = 0xd
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -137,8 +143,9 @@ block2:
 
 ; VCode:
 ; block0:
-;   xeq32 x5, x0, x1
-;   br_if x5, label2; jump label1
+;   xeq32 x6, x0, x1
+;   zext8 x6, x6
+;   br_if x6, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -147,8 +154,9 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; xeq32 x5, x0, x1
-; br_if x5, 0xa    // target = 0xd
+; xeq32 x6, x0, x1
+; zext8 x6, x6
+; br_if x6, 0xa    // target = 0x10
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -170,8 +178,9 @@ block2:
 
 ; VCode:
 ; block0:
-;   xneq32 x5, x0, x1
-;   br_if x5, label2; jump label1
+;   xneq32 x6, x0, x1
+;   zext8 x6, x6
+;   br_if x6, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -180,8 +189,9 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; xneq32 x5, x0, x1
-; br_if x5, 0xa    // target = 0xd
+; xneq32 x6, x0, x1
+; zext8 x6, x6
+; br_if x6, 0xa    // target = 0x10
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1
@@ -234,8 +244,9 @@ block2:
 
 ; VCode:
 ; block0:
-;   xulteq64 x5, x1, x0
-;   br_if x5, label2; jump label1
+;   xulteq64 x6, x1, x0
+;   zext8 x6, x6
+;   br_if x6, label2; jump label1
 ; block1:
 ;   xconst8 x0, 0
 ;   ret
@@ -244,8 +255,9 @@ block2:
 ;   ret
 ;
 ; Disassembled:
-; xulteq64 x5, x1, x0
-; br_if x5, 0xa    // target = 0xd
+; xulteq64 x6, x1, x0
+; zext8 x6, x6
+; br_if x6, 0xa    // target = 0x10
 ; xconst8 x0, 0
 ; ret
 ; xconst8 x0, 1