Commit f66fbcfb authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r352463: 

------------------------------------------------------------------------
r352463 | sam_parker | 2019-01-29 10:04:03 +0100 (Tue, 29 Jan 2019) | 6 lines

[AArch64] Update int64_t ACLE builtin arguments
    
Re-applying r351740 with fixes (changing LL to W).

Differential Revision: https://reviews.llvm.org/D56852

------------------------------------------------------------------------

llvm-svn: 352860
parent c081a5fb

clang/include/clang/Basic/BuiltinsAArch64.def

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ BUILTIN(__builtin_arm_clrex, "v", "") 


// Bit manipulation

BUILTIN(__builtin_arm_rbit, "UiUi", "nc")

BUILTIN(__builtin_arm_rbit64, "LUiLUi", "nc")

BUILTIN(__builtin_arm_rbit64, "WUiWUi", "nc")



// HINT

BUILTIN(__builtin_arm_nop, "v", "")
@@ -50,8 +50,8 @@ BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc") 
BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc")

BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc")

BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc")

BUILTIN(__builtin_arm_crc32d, "UiUiLUi", "nc")

BUILTIN(__builtin_arm_crc32cd, "UiUiLUi", "nc")

BUILTIN(__builtin_arm_crc32d, "UiUiWUi", "nc")

BUILTIN(__builtin_arm_crc32cd, "UiUiWUi", "nc")



// Memory barrier

BUILTIN(__builtin_arm_dmb, "vUi", "nc")
@@ -63,10 +63,10 @@ BUILTIN(__builtin_arm_prefetch, "vvC*UiUiUiUi", "nc") 


// System Registers

BUILTIN(__builtin_arm_rsr, "UicC*", "nc")

BUILTIN(__builtin_arm_rsr64, "LUicC*", "nc")

BUILTIN(__builtin_arm_rsr64, "WUicC*", "nc")

BUILTIN(__builtin_arm_rsrp, "v*cC*", "nc")

BUILTIN(__builtin_arm_wsr, "vcC*Ui", "nc")

BUILTIN(__builtin_arm_wsr64, "vcC*LUi", "nc")

BUILTIN(__builtin_arm_wsr64, "vcC*WUi", "nc")

BUILTIN(__builtin_arm_wsrp, "vcC*vC*", "nc")



// MSVC

clang/test/CodeGen/arm64-crc32.c

+11 −8
Original line number Diff line number Diff line 
// REQUIRES: aarch64-registered-target

// RUN: %clang_cc1 -triple arm64-none-linux-gnu \

// RUN:  -disable-O0-optnone -S -emit-llvm -o - %s | opt -S -mem2reg | FileCheck %s

// RUN: %clang_cc1 -triple aarch64-windows \

// RUN:  -disable-O0-optnone -S -emit-llvm -o - %s | opt -S -mem2reg | FileCheck %s

#include <stdint.h>



int crc32b(int a, char b)

uint32_t crc32b(uint32_t a, uint8_t b)

{

        return __builtin_arm_crc32b(a,b);

// CHECK: [[T0:%[0-9]+]] = zext i8 %b to i32

// CHECK: call i32 @llvm.aarch64.crc32b(i32 %a, i32 [[T0]])

}



int crc32cb(int a, char b)

uint32_t crc32cb(uint32_t a, uint8_t b)

{

        return __builtin_arm_crc32cb(a,b);

// CHECK: [[T0:%[0-9]+]] = zext i8 %b to i32

// CHECK: call i32 @llvm.aarch64.crc32cb(i32 %a, i32 [[T0]])

}



int crc32h(int a, short b)

uint32_t crc32h(uint32_t a, uint16_t b)

{

        return __builtin_arm_crc32h(a,b);

// CHECK: [[T0:%[0-9]+]] = zext i16 %b to i32

// CHECK: call i32 @llvm.aarch64.crc32h(i32 %a, i32 [[T0]])

}



int crc32ch(int a, short b)

uint32_t crc32ch(uint32_t a, uint16_t b)

{

        return __builtin_arm_crc32ch(a,b);

// CHECK: [[T0:%[0-9]+]] = zext i16 %b to i32

// CHECK: call i32 @llvm.aarch64.crc32ch(i32 %a, i32 [[T0]])

}



int crc32w(int a, int b)

uint32_t crc32w(uint32_t a, uint32_t b)

{

        return __builtin_arm_crc32w(a,b);

// CHECK: call i32 @llvm.aarch64.crc32w(i32 %a, i32 %b)

}



int crc32cw(int a, int b)

uint32_t crc32cw(uint32_t a, uint32_t b)

{

        return __builtin_arm_crc32cw(a,b);

// CHECK: call i32 @llvm.aarch64.crc32cw(i32 %a, i32 %b)

}



int crc32d(int a, long b)

uint32_t crc32d(uint32_t a, uint64_t b)

{

        return __builtin_arm_crc32d(a,b);

// CHECK: call i32 @llvm.aarch64.crc32x(i32 %a, i64 %b)

}



int crc32cd(int a, long b)

uint32_t crc32cd(uint32_t a, uint64_t b)

{

        return __builtin_arm_crc32cd(a,b);

// CHECK: call i32 @llvm.aarch64.crc32cx(i32 %a, i64 %b)

clang/test/CodeGen/builtins-arm64.c

+16 −4
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -triple arm64-unknown-linux -disable-O0-optnone -emit-llvm -o - %s | opt -S -mem2reg | FileCheck %s

// RUN: %clang_cc1 -triple arm64-unknown-linux -disable-O0-optnone -emit-llvm -o - %s | opt -S -mem2reg | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LINUX

// RUN: %clang_cc1 -triple aarch64-windows -disable-O0-optnone -S -emit-llvm -o - %s | opt -S -mem2reg | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-WIN

#include <stdint.h>



void f0(void *a, void *b) {
@@ -16,8 +17,15 @@ unsigned rbit(unsigned a) { 
  return __builtin_arm_rbit(a);

}



// CHECK-WIN: [[A64:%[^ ]+]] = zext i32 %a to i64

// CHECK-WIN: call i64 @llvm.bitreverse.i64(i64 [[A64]])

// CHECK-LINUX: call i64 @llvm.bitreverse.i64(i64 %a)

unsigned long rbitl(unsigned long a) {

  return __builtin_arm_rbit64(a);

}



// CHECK: call {{.*}} @llvm.bitreverse.i64(i64 %a)

unsigned long long rbit64(unsigned long long a) {

uint64_t rbit64(uint64_t a) {

  return __builtin_arm_rbit64(a);

}
@@ -60,7 +68,7 @@ uint32_t rsr() { 


__typeof__(__builtin_arm_rsr64("1:2:3:4:5")) rsr64(void);



uint64_t rsr64() {

uint64_t rsr64(void) {

  // CHECK: call i64 @llvm.read_register.i64(metadata ![[M0:[0-9]]])

  return __builtin_arm_rsr64("1:2:3:4:5");

}
@@ -71,13 +79,17 @@ void *rsrp() { 
  return __builtin_arm_rsrp("1:2:3:4:5");

}



__typeof__(__builtin_arm_wsr("1:2:3:4:5", 0)) wsr(unsigned);



void wsr(unsigned v) {

  // CHECK: [[V0:[%A-Za-z0-9.]+]] = zext i32 %v to i64

  // CHECK-NEXT: call void @llvm.write_register.i64(metadata ![[M0:[0-9]]], i64 [[V0]])

  __builtin_arm_wsr("1:2:3:4:5", v);

}



void wsr64(unsigned long v) {

__typeof__(__builtin_arm_wsr64("1:2:3:4:5", 0)) wsr64(uint64_t);



void wsr64(uint64_t v) {

  // CHECK: call void @llvm.write_register.i64(metadata ![[M0:[0-9]]], i64 %v)

  __builtin_arm_wsr64("1:2:3:4:5", v);

}