Revert the test changes too.

In 1169dc520815fa4a6b1285914748408729a28caa, I forgot to git add the
test file changes.
This commit is contained in:
Dan Gohman
2019-08-20 15:25:39 -07:00
parent 291afaf4ad
commit fbfeaaa32b
2 changed files with 21 additions and 19 deletions

View File

@@ -689,48 +689,48 @@ ebb0:
; asm: testq %rcx, %rcx ; asm: testq %rcx, %rcx
; asm: je ebb1 ; asm: je ebb1
brz v1, ebb1 ; bin: 48 85 c9 74 19 brz v1, ebb1 ; bin: 48 85 c9 74 1b
fallthrough ebb3 fallthrough ebb3
ebb3: ebb3:
; asm: testq %rsi, %rsi ; asm: testq %rsi, %rsi
; asm: je ebb1 ; asm: je ebb1
brz v2, ebb1 ; bin: 48 85 f6 74 14 brz v2, ebb1 ; bin: 48 85 f6 74 16
fallthrough ebb4 fallthrough ebb4
ebb4: ebb4:
; asm: testq %r10, %r10 ; asm: testq %r10, %r10
; asm: je ebb1 ; asm: je ebb1
brz v3, ebb1 ; bin: 4d 85 d2 74 0f brz v3, ebb1 ; bin: 4d 85 d2 74 11
fallthrough ebb5 fallthrough ebb5
ebb5: ebb5:
; asm: testq %rcx, %rcx ; asm: testq %rcx, %rcx
; asm: jne ebb1 ; asm: jne ebb1
brnz v1, ebb1 ; bin: 48 85 c9 75 0a brnz v1, ebb1 ; bin: 48 85 c9 75 0c
fallthrough ebb6 fallthrough ebb6
ebb6: ebb6:
; asm: testq %rsi, %rsi ; asm: testq %rsi, %rsi
; asm: jne ebb1 ; asm: jne ebb1
brnz v2, ebb1 ; bin: 48 85 f6 75 05 brnz v2, ebb1 ; bin: 48 85 f6 75 07
fallthrough ebb7 fallthrough ebb7
ebb7: ebb7:
; asm: testq %r10, %r10 ; asm: testq %r10, %r10
; asm: jne ebb1 ; asm: jne ebb1
brnz v3, ebb1 ; bin: 4d 85 d2 75 00 brnz v3, ebb1 ; bin: 4d 85 d2 75 02
; asm: jmp ebb2 ; asm: jmp ebb2
jump ebb2 jump ebb2 ; bin: eb 01
; asm: ebb1: ; asm: ebb1:
ebb1: ebb1:
return return ; bin: c3
; asm: ebb2: ; asm: ebb2:
ebb2: ebb2:
jump ebb1 jump ebb1 ; bin: eb fd
} }
; CPU flag instructions. ; CPU flag instructions.
@@ -1292,41 +1292,40 @@ ebb0:
; asm: testl %ecx, %ecx ; asm: testl %ecx, %ecx
; asm: je ebb1x ; asm: je ebb1x
brz v1, ebb1 ; bin: 85 c9 74 16 brz v1, ebb1 ; bin: 85 c9 74 18
fallthrough ebb3 fallthrough ebb3
ebb3: ebb3:
; asm: testl %esi, %esi ; asm: testl %esi, %esi
; asm: je ebb1x ; asm: je ebb1x
brz v2, ebb1 ; bin: 85 f6 74 12 brz v2, ebb1 ; bin: 85 f6 74 14
fallthrough ebb4 fallthrough ebb4
ebb4: ebb4:
; asm: testl %r10d, %r10d ; asm: testl %r10d, %r10d
; asm: je ebb1x ; asm: je ebb1x
brz v3, ebb1 ; bin: 45 85 d2 74 0d brz v3, ebb1 ; bin: 45 85 d2 74 0f
fallthrough ebb5 fallthrough ebb5
ebb5: ebb5:
; asm: testl %ecx, %ecx ; asm: testl %ecx, %ecx
; asm: jne ebb1x ; asm: jne ebb1x
brnz v1, ebb1 ; bin: 85 c9 75 09 brnz v1, ebb1 ; bin: 85 c9 75 0b
fallthrough ebb6 fallthrough ebb6
ebb6: ebb6:
; asm: testl %esi, %esi ; asm: testl %esi, %esi
; asm: jne ebb1x ; asm: jne ebb1x
brnz v2, ebb1 ; bin: 85 f6 75 05 brnz v2, ebb1 ; bin: 85 f6 75 07
fallthrough ebb7 fallthrough ebb7
ebb7: ebb7:
; asm: testl %r10d, %r10d ; asm: testl %r10d, %r10d
; asm: jne ebb1x ; asm: jne ebb1x
brnz v3, ebb1 ; bin: 45 85 d2 75 00 brnz v3, ebb1 ; bin: 45 85 d2 75 02
; asm: jmp ebb2x ; asm: jmp ebb2x
; branch relaxation translates this into `fallthrough ebb1` jump ebb2 ; bin: eb 01
jump ebb2
; asm: ebb1x: ; asm: ebb1x:
ebb1: ebb1:

View File

@@ -11,9 +11,9 @@ function u0:0(i64) system_v {
ebb0(v0: i64): ebb0(v0: i64):
v1 = stack_addr.i64 ss0 v1 = stack_addr.i64 ss0
v2 = load.i8 v1 v2 = load.i8 v1
br_table v2, ebb1, jt0 br_table v2, ebb2, jt0
; check: $(oob=$V) = ifcmp_imm $(idx=$V), 1 ; check: $(oob=$V) = ifcmp_imm $(idx=$V), 1
; nextln: brif uge $oob, ebb1 ; nextln: brif uge $oob, ebb2
; nextln: fallthrough $(inb=$EBB) ; nextln: fallthrough $(inb=$EBB)
; check: $inb: ; check: $inb:
; nextln: $(final_idx=$V) = uextend.i64 $idx ; nextln: $(final_idx=$V) = uextend.i64 $idx
@@ -22,6 +22,9 @@ ebb0(v0: i64):
; nextln: $(addr=$V) = iadd $base, $rel_addr ; nextln: $(addr=$V) = iadd $base, $rel_addr
; nextln: indirect_jump_table_br $addr, jt0 ; nextln: indirect_jump_table_br $addr, jt0
ebb2:
jump ebb1
ebb1: ebb1:
return return
} }