Skip to content

[AArch64][GlobalISel] Fix TLS accesses clobbering registers incorrectly. #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2020
Merged

[AArch64][GlobalISel] Fix TLS accesses clobbering registers incorrectly. #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2494,17 +2494,20 @@ bool AArch64InstructionSelector::selectTLSGlobalValue(
const GlobalValue &GV = *I.getOperand(1).getGlobal();
MachineIRBuilder MIB(I);

MIB.buildInstr(AArch64::LOADgot, {AArch64::X0}, {})
.addGlobalAddress(&GV, 0, AArch64II::MO_TLS);
auto LoadGOT =
MIB.buildInstr(AArch64::LOADgot, {&AArch64::GPR64commonRegClass}, {})
.addGlobalAddress(&GV, 0, AArch64II::MO_TLS);

auto Load = MIB.buildInstr(AArch64::LDRXui, {&AArch64::GPR64commonRegClass},
{Register(AArch64::X0)})
{LoadGOT.getReg(0)})
.addImm(0);

MIB.buildCopy(Register(AArch64::X0), LoadGOT.getReg(0));
// TLS calls preserve all registers except those that absolutely must be
// trashed: X0 (it takes an argument), LR (it's a call) and NZCV (let's not be
// silly).
MIB.buildInstr(AArch64::BLR, {}, {Load})
.addUse(AArch64::X0, RegState::Implicit)
.addDef(AArch64::X0, RegState::Implicit)
.addRegMask(TRI.getTLSCallPreservedMask());

Expand Down
207 changes: 207 additions & 0 deletions llvm/test/CodeGen/AArch64/GlobalISel/darwin-tls-call-clobber.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
; RUN: llc -mtriple aarch64-apple-darwin -O0 -global-isel -verify-machineinstrs %s -o - 2>&1 | FileCheck %s
target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
target triple = "arm64-apple-ios13.0.0"

@t_val = thread_local global i32 0, align 4
@.str = private unnamed_addr constant [5 x i8] c"str1\00", align 1
@str1 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str, i32 0, i32 0), align 8
@.str.1 = private unnamed_addr constant [5 x i8] c"str2\00", align 1
@str2 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i32 0, i32 0), align 8
@.str.2 = private unnamed_addr constant [5 x i8] c"str3\00", align 1
@str3 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.2, i32 0, i32 0), align 8
@.str.3 = private unnamed_addr constant [5 x i8] c"str4\00", align 1
@str4 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.3, i32 0, i32 0), align 8
@.str.4 = private unnamed_addr constant [5 x i8] c"str5\00", align 1
@str5 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.4, i32 0, i32 0), align 8
@.str.5 = private unnamed_addr constant [5 x i8] c"str6\00", align 1
@str6 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.5, i32 0, i32 0), align 8
@.str.6 = private unnamed_addr constant [5 x i8] c"str7\00", align 1
@str7 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.6, i32 0, i32 0), align 8
@.str.7 = private unnamed_addr constant [5 x i8] c"str8\00", align 1
@str8 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.7, i32 0, i32 0), align 8
@.str.8 = private unnamed_addr constant [5 x i8] c"str9\00", align 1
@str9 = global i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str.8, i32 0, i32 0), align 8
@.str.9 = private unnamed_addr constant [6 x i8] c"str10\00", align 1
@str10 = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str.9, i32 0, i32 0), align 8
@.str.10 = private unnamed_addr constant [4 x i8] c"%s\0A\00", align 1
@.str.11 = private unnamed_addr constant [4 x i8] c"%d\0A\00", align 1
@.str.12 = private unnamed_addr constant [4 x i8] c"xyz\00", align 1


; This test checks that we don't re-use the register for the variable descriptor
; for the second ldr.
; CHECK: adrp x2, _t_val@TLVPPAGE
; CHECK: ldr x2, [x2, _t_val@TLVPPAGEOFF]
; CHECK: ldr x3, [x2]
; CHECK: mov x0, x2
; CHECK: blr x3

define void @_Z4funcPKc(i8* %id) {
entry:
%id.addr = alloca i8*, align 8
store i8* %id, i8** %id.addr, align 8
%0 = load i8*, i8** %id.addr, align 8
%1 = load i8*, i8** @str1, align 8
%cmp = icmp eq i8* %0, %1
br i1 %cmp, label %if.then, label %if.else

if.then: ; preds = %entry
%2 = load i8*, i8** @str1, align 8
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %2)
%3 = load i8*, i8** @str2, align 8
%call1 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %3)
%4 = load i8*, i8** @str3, align 8
%call2 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %4)
%5 = load i8*, i8** @str4, align 8
%call3 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %5)
%6 = load i8*, i8** @str5, align 8
%call4 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %6)
%7 = load i8*, i8** @str6, align 8
%call5 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %7)
%8 = load i8*, i8** @str7, align 8
%call6 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %8)
%9 = load i8*, i8** @str8, align 8
%call7 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %9)
%10 = load i8*, i8** @str9, align 8
%call8 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %10)
%11 = load i8*, i8** @str10, align 8
%call9 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %11)
%12 = load i32, i32* @t_val, align 4
%call10 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.11, i64 0, i64 0), i32 %12)
br label %if.end56

if.else: ; preds = %entry
%13 = load i8*, i8** %id.addr, align 8
%14 = load i8*, i8** @str2, align 8
%cmp11 = icmp eq i8* %13, %14
br i1 %cmp11, label %if.then12, label %if.else24

if.then12: ; preds = %if.else
%15 = load i8*, i8** @str1, align 8
%call13 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %15)
%16 = load i8*, i8** @str2, align 8
%call14 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %16)
%17 = load i8*, i8** @str3, align 8
%call15 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %17)
%18 = load i8*, i8** @str4, align 8
%call16 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %18)
%19 = load i8*, i8** @str5, align 8
%call17 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %19)
%20 = load i8*, i8** @str6, align 8
%call18 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %20)
%21 = load i8*, i8** @str7, align 8
%call19 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %21)
%22 = load i8*, i8** @str8, align 8
%call20 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %22)
%23 = load i8*, i8** @str9, align 8
%call21 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %23)
%24 = load i8*, i8** @str10, align 8
%call22 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.10, i64 0, i64 0), i8* %24)
%25 = load i32, i32* @t_val, align 4
%call23 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str.11, i64 0, i64 0), i32 %25)
br label %if.end55

if.else24: ; preds = %if.else
%26 = load i8*, i8** %id.addr, align 8
%27 = load i8*, i8** @str3, align 8
%cmp25 = icmp eq i8* %26, %27
br i1 %cmp25, label %if.then26, label %if.else27

if.then26: ; preds = %if.else24
br label %if.end54

if.else27: ; preds = %if.else24
%28 = load i8*, i8** %id.addr, align 8
%29 = load i8*, i8** @str4, align 8
%cmp28 = icmp eq i8* %28, %29
br i1 %cmp28, label %if.then29, label %if.else30

if.then29: ; preds = %if.else27
br label %if.end53

if.else30: ; preds = %if.else27
%30 = load i8*, i8** %id.addr, align 8
%31 = load i8*, i8** @str5, align 8
%cmp31 = icmp eq i8* %30, %31
br i1 %cmp31, label %if.then32, label %if.else33

if.then32: ; preds = %if.else30
br label %if.end52

if.else33: ; preds = %if.else30
%32 = load i8*, i8** %id.addr, align 8
%33 = load i8*, i8** @str6, align 8
%cmp34 = icmp eq i8* %32, %33
br i1 %cmp34, label %if.then35, label %if.else36

if.then35: ; preds = %if.else33
br label %if.end51

if.else36: ; preds = %if.else33
%34 = load i8*, i8** %id.addr, align 8
%35 = load i8*, i8** @str7, align 8
%cmp37 = icmp eq i8* %34, %35
br i1 %cmp37, label %if.then38, label %if.else39

if.then38: ; preds = %if.else36
br label %if.end50

if.else39: ; preds = %if.else36
%36 = load i8*, i8** %id.addr, align 8
%37 = load i8*, i8** @str8, align 8
%cmp40 = icmp eq i8* %36, %37
br i1 %cmp40, label %if.then41, label %if.else42

if.then41: ; preds = %if.else39
br label %if.end49

if.else42: ; preds = %if.else39
%38 = load i8*, i8** %id.addr, align 8
%39 = load i8*, i8** @str9, align 8
%cmp43 = icmp eq i8* %38, %39
br i1 %cmp43, label %if.then44, label %if.else45

if.then44: ; preds = %if.else42
br label %if.end48

if.else45: ; preds = %if.else42
%40 = load i8*, i8** %id.addr, align 8
%41 = load i8*, i8** @str10, align 8
%cmp46 = icmp eq i8* %40, %41
br i1 %cmp46, label %if.then47, label %if.end

if.then47: ; preds = %if.else45
br label %if.end

if.end: ; preds = %if.then47, %if.else45
br label %if.end48

if.end48: ; preds = %if.end, %if.then44
br label %if.end49

if.end49: ; preds = %if.end48, %if.then41
br label %if.end50

if.end50: ; preds = %if.end49, %if.then38
br label %if.end51

if.end51: ; preds = %if.end50, %if.then35
br label %if.end52

if.end52: ; preds = %if.end51, %if.then32
br label %if.end53

if.end53: ; preds = %if.end52, %if.then29
br label %if.end54

if.end54: ; preds = %if.end53, %if.then26
br label %if.end55

if.end55: ; preds = %if.end54, %if.then12
br label %if.end56

if.end56: ; preds = %if.end55, %if.then
ret void
}
declare i32 @printf(i8*, ...)

4 changes: 2 additions & 2 deletions llvm/test/CodeGen/AArch64/arm64-tls-darwin.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
define i8 @get_var() {
; CHECK-LABEL: get_var:
; CHECK: adrp x[[TLVPDESC_SLOT_HI:[0-9]+]], _var@TLVPPAGE
; CHECK: ldr x0, [x[[TLVPDESC_SLOT_HI]], _var@TLVPPAGEOFF]
; CHECK: ldr [[TLV_GET_ADDR:x[0-9]+]], [x0]
; CHECK: ldr x[[PTR:[0-9]+]], [x[[TLVPDESC_SLOT_HI]], _var@TLVPPAGEOFF]
; CHECK: ldr [[TLV_GET_ADDR:x[0-9]+]], [x[[PTR]]]
; CHECK: blr [[TLV_GET_ADDR]]
; CHECK: ldrb w0, [x0]

Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/AArch64/arm64e-ptrauth-tls.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
define i8 @get_var() #0 {
; CHECK-LABEL: get_var:
; CHECK: adrp x[[TLVPDESC_SLOT_HI:[0-9]+]], _var@TLVPPAGE
; CHECK: ldr x0, [x[[TLVPDESC_SLOT_HI]], _var@TLVPPAGEOFF]
; CHECK: ldr [[TLV_GET_ADDR:x[0-9]+]], [x0]
; CHECK: ldr x[[PTR:[0-9]+]], [x[[TLVPDESC_SLOT_HI]], _var@TLVPPAGEOFF]
; CHECK: ldr [[TLV_GET_ADDR:x[0-9]+]], [x[[PTR]]]
; CHECK: blraaz [[TLV_GET_ADDR]]
; CHECK: ldrb w0, [x0]

Expand Down