Skip to content

Commit d832fd2

Browse files
committed
[SOL] Fix broken tests unrelated to Solana/BPF backend
- duplicate checks in stack-clash-medium removed - align attribute is not supported by cmpxchg yet
1 parent 393dae0 commit d832fd2

File tree

2 files changed

+5
-29
lines changed

2 files changed

+5
-29
lines changed

llvm/test/CodeGen/X86/stack-clash-medium.ll

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,6 @@
22
; RUN: llc -mtriple=i686-linux-android < %s | FileCheck -check-prefix=CHECK-X86-32 %s
33

44
define i32 @foo() local_unnamed_addr #0 {
5-
; CHECK-X86-64-LABEL: foo:
6-
; CHECK-X86-64: # %bb.0:
7-
; CHECK-X86-64-NEXT: subq $4096, %rsp # imm = 0x1000
8-
; CHECK-X86-64-NEXT: .cfi_adjust_cfa_offset 4096
9-
; CHECK-X86-64-NEXT: movq $0, (%rsp)
10-
; CHECK-X86-64-NEXT: subq $3784, %rsp # imm = 0xEC8
11-
; CHECK-X86-64-NEXT: .cfi_def_cfa_offset 7888
12-
; CHECK-X86-64-NEXT: movl $1, 672(%rsp)
13-
; CHECK-X86-64-NEXT: movl -128(%rsp), %eax
14-
; CHECK-X86-64-NEXT: addq $7880, %rsp # imm = 0x1EC8
15-
; CHECK-X86-64-NEXT: .cfi_def_cfa_offset 8
16-
; CHECK-X86-64-NEXT: retq
17-
;
18-
; CHECK-X86-32-LABEL: foo:
19-
; CHECK-X86-32: # %bb.0:
20-
; CHECK-X86-32-NEXT: subl $4096, %esp # imm = 0x1000
21-
; CHECK-X86-32-NEXT: .cfi_adjust_cfa_offset 4096
22-
; CHECK-X86-32-NEXT: movl $0, (%esp)
23-
; CHECK-X86-32-NEXT: subl $3916, %esp # imm = 0xF4C
24-
; CHECK-X86-32-NEXT: .cfi_def_cfa_offset 8016
25-
; CHECK-X86-32-NEXT: movl $1, 800(%esp)
26-
; CHECK-X86-32-NEXT: movl (%esp), %eax
27-
; CHECK-X86-32-NEXT: addl $8012, %esp # imm = 0x1F4C
28-
; CHECK-X86-32-NEXT: .cfi_def_cfa_offset 4
29-
; CHECK-X86-32-NEXT: retl
305
%a = alloca i32, i64 2000, align 16
316
%b = getelementptr inbounds i32, i32* %a, i64 200
327
store volatile i32 1, i32* %b
@@ -39,6 +14,7 @@ attributes #0 = {"probe-stack"="inline-asm"}
3914
; CHECK-X86-64-LABEL: foo:
4015
; CHECK-X86-64: # %bb.0:
4116
; CHECK-X86-64-NEXT: subq $4096, %rsp # imm = 0x1000
17+
; CHECK-X86-64-NEXT: .cfi_adjust_cfa_offset 4096
4218
; CHECK-X86-64-NEXT: movq $0, (%rsp)
4319
; CHECK-X86-64-NEXT: subq $3784, %rsp # imm = 0xEC8
4420
; CHECK-X86-64-NEXT: .cfi_def_cfa_offset 7888
@@ -48,10 +24,10 @@ attributes #0 = {"probe-stack"="inline-asm"}
4824
; CHECK-X86-64-NEXT: .cfi_def_cfa_offset 8
4925
; CHECK-X86-64-NEXT: retq
5026

51-
52-
; CHECK-X86-32-LABEL: foo:
27+
; CHECK-X86-32-LABEL: foo:{{.*}}
5328
; CHECK-X86-32: # %bb.0:
5429
; CHECK-X86-32-NEXT: subl $4096, %esp # imm = 0x1000
30+
; CHECK-X86-32-NEXT: .cfi_adjust_cfa_offset 4096
5531
; CHECK-X86-32-NEXT: movl $0, (%esp)
5632
; CHECK-X86-32-NEXT: subl $3916, %esp # imm = 0xF4C
5733
; CHECK-X86-32-NEXT: .cfi_def_cfa_offset 8016

llvm/test/Transforms/LICM/promote-atomic.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ define void @test(%class.LiveThread* %live_thread) {
1313
; CHECK-NEXT: br label [[LOOP:%.*]]
1414
; CHECK: loop:
1515
; CHECK-NEXT: store %class.LiveThread* undef, %class.LiveThread** [[NEXT_UNPROCESSED_]], align 8
16-
; CHECK-NEXT: [[XCHG:%.*]] = cmpxchg weak i64* @globallive, i64 undef, i64 undef release monotonic, align 8
16+
; CHECK-NEXT: [[XCHG:%.*]] = cmpxchg weak i64* @globallive, i64 undef, i64 undef release monotonic
1717
; CHECK-NEXT: [[DONE:%.*]] = extractvalue { i64, i1 } [[XCHG]], 1
1818
; CHECK-NEXT: br i1 [[DONE]], label [[EXIT:%.*]], label [[LOOP]]
1919
; CHECK: exit:
@@ -24,7 +24,7 @@ define void @test(%class.LiveThread* %live_thread) {
2424

2525
loop:
2626
store %class.LiveThread* undef, %class.LiveThread** %next_unprocessed_, align 8
27-
%xchg = cmpxchg weak i64* @globallive, i64 undef, i64 undef release monotonic, align 8
27+
%xchg = cmpxchg weak i64* @globallive, i64 undef, i64 undef release monotonic
2828
%done = extractvalue { i64, i1 } %xchg, 1
2929
br i1 %done, label %exit, label %loop
3030

0 commit comments

Comments
 (0)