nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[builtins] Support architectures with 16-bit int

Browse Source 
This is the first patch in a series to add support for the AVR target.
This patch includes changes to make compiler-rt more target independent
by not relying on the width of an int or long.

Differential Revision: https://reviews.llvm.org/D78662
This commit is contained in:
Ayke van Laethem
2020-04-22 20:25:22 +02:00
parent c1cb733db6
commit 4d41df6482
25 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/builtins/absvsi2.c
View File

@@ -18,7 +18,7 @@
COMPILER_RT_ABI si_int __absvsi2(si_int a) { COMPILER_RT_ABI si_int __absvsi2(si_int a) {
const int N = (int)(sizeof(si_int) * CHAR_BIT); const int N = (int)(sizeof(si_int) * CHAR_BIT);
if (a == (1 << (N - 1))) if (a == ((si_int)1 << (N - 1)))
compilerrt_abort(); compilerrt_abort();
const si_int t = a >> (N - 1); const si_int t = a >> (N - 1);
return (a ^ t) - t; return (a ^ t) - t;

2
compiler-rt/lib/builtins/ashldi3.c
View File

@@ -16,7 +16,7 @@
// Precondition: 0 <= b < bits_in_dword // Precondition: 0 <= b < bits_in_dword
COMPILER_RT_ABI di_int __ashldi3(di_int a, si_int b) { COMPILER_RT_ABI di_int __ashldi3(di_int a, int b) {
const int bits_in_word = (int)(sizeof(si_int) * CHAR_BIT); const int bits_in_word = (int)(sizeof(si_int) * CHAR_BIT);
dwords input; dwords input;
dwords result; dwords result;

2
compiler-rt/lib/builtins/ashrdi3.c
View File

@@ -16,7 +16,7 @@
// Precondition: 0 <= b < bits_in_dword // Precondition: 0 <= b < bits_in_dword
COMPILER_RT_ABI di_int __ashrdi3(di_int a, si_int b) { COMPILER_RT_ABI di_int __ashrdi3(di_int a, int b) {
const int bits_in_word = (int)(sizeof(si_int) * CHAR_BIT); const int bits_in_word = (int)(sizeof(si_int) * CHAR_BIT);
dwords input; dwords input;
dwords result; dwords result;

2
compiler-rt/lib/builtins/clzdi2.c
View File

@@ -30,6 +30,6 @@ COMPILER_RT_ABI si_int __clzdi2(di_int a) {
dwords x; dwords x;
x.all = a; x.all = a;
const si_int f = -(x.s.high == 0); const si_int f = -(x.s.high == 0);
return __builtin_clz((x.s.high & ~f) | (x.s.low & f)) + return clzsi((x.s.high & ~f) | (x.s.low & f)) +
(f & ((si_int)(sizeof(si_int) * CHAR_BIT))); (f & ((si_int)(sizeof(si_int) * CHAR_BIT)));
} }

4
compiler-rt/lib/builtins/ctzdi2.c
View File

@@ -26,10 +26,10 @@ extern si_int __ctzsi2(si_int);
// Precondition: a != 0 // Precondition: a != 0
COMPILER_RT_ABI si_int __ctzdi2(di_int a) { COMPILER_RT_ABI int __ctzdi2(di_int a) {
dwords x; dwords x;
x.all = a; x.all = a;
const si_int f = -(x.s.low == 0); const si_int f = -(x.s.low == 0);
return __builtin_ctz((x.s.high & f) | (x.s.low & ~f)) + return ctzsi((x.s.high & f) | (x.s.low & ~f)) +
(f & ((si_int)(sizeof(si_int) * CHAR_BIT))); (f & ((si_int)(sizeof(si_int) * CHAR_BIT)));
} }

6
compiler-rt/lib/builtins/ffsdi2.c
View File

@@ -15,13 +15,13 @@
// Returns: the index of the least significant 1-bit in a, or // Returns: the index of the least significant 1-bit in a, or
// the value zero if a is zero. The least significant bit is index one. // the value zero if a is zero. The least significant bit is index one.
COMPILER_RT_ABI si_int __ffsdi2(di_int a) { COMPILER_RT_ABI int __ffsdi2(di_int a) {
dwords x; dwords x;
x.all = a; x.all = a;
if (x.s.low == 0) { if (x.s.low == 0) {
if (x.s.high == 0) if (x.s.high == 0)
return 0; return 0;
return __builtin_ctz(x.s.high) + (1 + sizeof(si_int) * CHAR_BIT); return ctzsi(x.s.high) + (1 + sizeof(si_int) * CHAR_BIT);
} }
return __builtin_ctz(x.s.low) + 1; return ctzsi(x.s.low) + 1;
} }

4
compiler-rt/lib/builtins/ffssi2.c
View File

@@ -15,9 +15,9 @@
// Returns: the index of the least significant 1-bit in a, or // Returns: the index of the least significant 1-bit in a, or
// the value zero if a is zero. The least significant bit is index one. // the value zero if a is zero. The least significant bit is index one.
COMPILER_RT_ABI si_int __ffssi2(si_int a) { COMPILER_RT_ABI int __ffssi2(si_int a) {
if (a == 0) { if (a == 0) {
return 0; return 0;
} }
return __builtin_ctz(a) + 1; return ctzsi(a) + 1;
} }

2
compiler-rt/lib/builtins/floatdisf.c
View File

@@ -26,7 +26,7 @@ COMPILER_RT_ABI float __floatdisf(di_int a) {
const di_int s = a >> (N - 1); const di_int s = a >> (N - 1);
a = (a ^ s) - s; a = (a ^ s) - s;
int sd = N - __builtin_clzll(a); // number of significant digits int sd = N - __builtin_clzll(a); // number of significant digits
int e = sd - 1; // exponent si_int e = sd - 1; // exponent
if (sd > FLT_MANT_DIG) { if (sd > FLT_MANT_DIG) {
// start: 0000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQxxxxxxxxxxxxxxxxxx // start: 0000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQxxxxxxxxxxxxxxxxxx
// finish: 000000000000000000000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQR // finish: 000000000000000000000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQR

8
compiler-rt/lib/builtins/floatsidf.c
View File

@@ -17,7 +17,7 @@
#include "int_lib.h" #include "int_lib.h"
COMPILER_RT_ABI fp_t __floatsidf(int a) { COMPILER_RT_ABI fp_t __floatsidf(si_int a) {
const int aWidth = sizeof a * CHAR_BIT; const int aWidth = sizeof a * CHAR_BIT;
@@ -33,14 +33,14 @@ COMPILER_RT_ABI fp_t __floatsidf(int a) {
} }
// Exponent of (fp_t)a is the width of abs(a). // Exponent of (fp_t)a is the width of abs(a).
const int exponent = (aWidth - 1) - __builtin_clz(a); const int exponent = (aWidth - 1) - clzsi(a);
rep_t result; rep_t result;
// Shift a into the significand field and clear the implicit bit. Extra // Shift a into the significand field and clear the implicit bit. Extra
// cast to unsigned int is necessary to get the correct behavior for // cast to unsigned int is necessary to get the correct behavior for
// the input INT_MIN. // the input INT_MIN.
const int shift = significandBits - exponent; const int shift = significandBits - exponent;
result = (rep_t)(unsigned int)a << shift ^ implicitBit; result = (rep_t)(su_int)a << shift ^ implicitBit;
// Insert the exponent // Insert the exponent
result += (rep_t)(exponent + exponentBias) << significandBits; result += (rep_t)(exponent + exponentBias) << significandBits;
@@ -50,7 +50,7 @@ COMPILER_RT_ABI fp_t __floatsidf(int a) {
#if defined(__ARM_EABI__) #if defined(__ARM_EABI__)
#if defined(COMPILER_RT_ARMHF_TARGET) #if defined(COMPILER_RT_ARMHF_TARGET)
AEABI_RTABI fp_t __aeabi_i2d(int a) { return __floatsidf(a); } AEABI_RTABI fp_t __aeabi_i2d(si_int a) { return __floatsidf(a); }
#else #else
COMPILER_RT_ALIAS(__floatsidf, __aeabi_i2d) COMPILER_RT_ALIAS(__floatsidf, __aeabi_i2d)
#endif #endif

2
compiler-rt/lib/builtins/floatundisf.c
View File

@@ -24,7 +24,7 @@ COMPILER_RT_ABI float __floatundisf(du_int a) {
return 0.0F; return 0.0F;
const unsigned N = sizeof(du_int) * CHAR_BIT; const unsigned N = sizeof(du_int) * CHAR_BIT;
int sd = N - __builtin_clzll(a); // number of significant digits int sd = N - __builtin_clzll(a); // number of significant digits
int e = sd - 1; // 8 exponent si_int e = sd - 1; // 8 exponent
if (sd > FLT_MANT_DIG) { if (sd > FLT_MANT_DIG) {
// start: 0000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQxxxxxxxxxxxxxxxxxx // start: 0000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQxxxxxxxxxxxxxxxxxx
// finish: 000000000000000000000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQR // finish: 000000000000000000000000000000000000001xxxxxxxxxxxxxxxxxxxxxxPQR

6
compiler-rt/lib/builtins/floatunsidf.c
View File

@@ -17,7 +17,7 @@
#include "int_lib.h" #include "int_lib.h"
COMPILER_RT_ABI fp_t __floatunsidf(unsigned int a) { COMPILER_RT_ABI fp_t __floatunsidf(su_int a) {
const int aWidth = sizeof a * CHAR_BIT; const int aWidth = sizeof a * CHAR_BIT;
@@ -26,7 +26,7 @@ COMPILER_RT_ABI fp_t __floatunsidf(unsigned int a) {
return fromRep(0); return fromRep(0);
// Exponent of (fp_t)a is the width of abs(a). // Exponent of (fp_t)a is the width of abs(a).
const int exponent = (aWidth - 1) - __builtin_clz(a); const int exponent = (aWidth - 1) - clzsi(a);
rep_t result; rep_t result;
// Shift a into the significand field and clear the implicit bit. // Shift a into the significand field and clear the implicit bit.
@@ -40,7 +40,7 @@ COMPILER_RT_ABI fp_t __floatunsidf(unsigned int a) {
#if defined(__ARM_EABI__) #if defined(__ARM_EABI__)
#if defined(COMPILER_RT_ARMHF_TARGET) #if defined(COMPILER_RT_ARMHF_TARGET)
AEABI_RTABI fp_t __aeabi_ui2d(unsigned int a) { return __floatunsidf(a); } AEABI_RTABI fp_t __aeabi_ui2d(su_int a) { return __floatunsidf(a); }
#else #else
COMPILER_RT_ALIAS(__floatunsidf, __aeabi_ui2d) COMPILER_RT_ALIAS(__floatunsidf, __aeabi_ui2d)
#endif #endif

2
compiler-rt/lib/builtins/fp_extend.h
View File

@@ -21,7 +21,7 @@ typedef float src_t;
typedef uint32_t src_rep_t; typedef uint32_t src_rep_t;
#define SRC_REP_C UINT32_C #define SRC_REP_C UINT32_C
static const int srcSigBits = 23; static const int srcSigBits = 23;
#define src_rep_t_clz __builtin_clz #define src_rep_t_clz clzsi
#elif defined SRC_DOUBLE #elif defined SRC_DOUBLE
typedef double src_t; typedef double src_t;

4
compiler-rt/lib/builtins/fp_lib.h
View File

@@ -69,9 +69,9 @@ static __inline int rep_clz(rep_t a) {
return __builtin_clzl(a); return __builtin_clzl(a);
#else #else
if (a & REP_C(0xffffffff00000000)) if (a & REP_C(0xffffffff00000000))
return __builtin_clz(a >> 32); return clzsi(a >> 32);
else else
return 32 + __builtin_clz(a & REP_C(0xffffffff)); return 32 + clzsi(a & REP_C(0xffffffff));
#endif #endif
} }

2
compiler-rt/lib/builtins/int_div_impl.inc
View File

@@ -10,7 +10,7 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#define clz(a) (sizeof(a) == sizeof(unsigned long long) ? __builtin_clzll(a) : __builtin_clz(a)) #define clz(a) (sizeof(a) == sizeof(unsigned long long) ? __builtin_clzll(a) : clzsi(a))
// Adapted from Figure 3-40 of The PowerPC Compiler Writer's Guide // Adapted from Figure 3-40 of The PowerPC Compiler Writer's Guide
static __inline fixuint_t __udivXi3(fixuint_t n, fixuint_t d) { static __inline fixuint_t __udivXi3(fixuint_t n, fixuint_t d) {

17
compiler-rt/lib/builtins/int_types.h
View File

@@ -22,11 +22,20 @@
#ifdef si_int #ifdef si_int
#undef si_int #undef si_int
#endif #endif
typedef int si_int; typedef int32_t si_int;
typedef unsigned su_int; typedef uint32_t su_int;
#if UINT_MAX == 0xFFFFFFFF
#define clzsi __builtin_clz
#define ctzsi __builtin_ctz
#elif ULONG_MAX == 0xFFFFFFFF
#define clzsi __builtin_clzl
#define ctzsi __builtin_ctzl
#else
#error could not determine appropriate clzsi macro for this system
#endif
typedef long long di_int; typedef int64_t di_int;
typedef unsigned long long du_int; typedef uint64_t du_int;
typedef union { typedef union {
di_int all; di_int all;

2
compiler-rt/lib/builtins/lshrdi3.c
View File

@@ -16,7 +16,7 @@
// Precondition: 0 <= b < bits_in_dword // Precondition: 0 <= b < bits_in_dword
COMPILER_RT_ABI di_int __lshrdi3(di_int a, si_int b) { COMPILER_RT_ABI di_int __lshrdi3(di_int a, int b) {
const int bits_in_word = (int)(sizeof(si_int) * CHAR_BIT); const int bits_in_word = (int)(sizeof(si_int) * CHAR_BIT);
udwords input; udwords input;
udwords result; udwords result;

2
compiler-rt/lib/builtins/popcountdi2.c
View File

@@ -14,7 +14,7 @@
// Returns: count of 1 bits // Returns: count of 1 bits
COMPILER_RT_ABI si_int __popcountdi2(di_int a) { COMPILER_RT_ABI int __popcountdi2(di_int a) {
du_int x2 = (du_int)a; du_int x2 = (du_int)a;
x2 = x2 - ((x2 >> 1) & 0x5555555555555555uLL); x2 = x2 - ((x2 >> 1) & 0x5555555555555555uLL);
// Every 2 bits holds the sum of every pair of bits (32) // Every 2 bits holds the sum of every pair of bits (32)

6
compiler-rt/lib/builtins/udivmoddi4.c
View File

@@ -87,7 +87,7 @@ COMPILER_RT_ABI du_int __udivmoddi4(du_int a, du_int b, du_int *rem) {
// K K // K K
// --- // ---
// K 0 // K 0
sr = __builtin_clz(d.s.high) - __builtin_clz(n.s.high); sr = clzsi(d.s.high) - clzsi(n.s.high);
// 0 <= sr <= n_uword_bits - 2 or sr large // 0 <= sr <= n_uword_bits - 2 or sr large
if (sr > n_uword_bits - 2) { if (sr > n_uword_bits - 2) {
if (rem) if (rem)
@@ -120,7 +120,7 @@ COMPILER_RT_ABI du_int __udivmoddi4(du_int a, du_int b, du_int *rem) {
// K X // K X
// --- // ---
// 0 K // 0 K
sr = 1 + n_uword_bits + __builtin_clz(d.s.low) - __builtin_clz(n.s.high); sr = 1 + n_uword_bits + clzsi(d.s.low) - clzsi(n.s.high);
// 2 <= sr <= n_udword_bits - 1 // 2 <= sr <= n_udword_bits - 1
// q.all = n.all << (n_udword_bits - sr); // q.all = n.all << (n_udword_bits - sr);
// r.all = n.all >> sr; // r.all = n.all >> sr;
@@ -145,7 +145,7 @@ COMPILER_RT_ABI du_int __udivmoddi4(du_int a, du_int b, du_int *rem) {
// K X // K X
// --- // ---
// K K // K K
sr = __builtin_clz(d.s.high) - __builtin_clz(n.s.high); sr = clzsi(d.s.high) - clzsi(n.s.high);
// 0 <= sr <= n_uword_bits - 1 or sr large // 0 <= sr <= n_uword_bits - 1 or sr large
if (sr > n_uword_bits - 1) { if (sr > n_uword_bits - 1) {
if (rem) if (rem)

4
compiler-rt/test/builtins/Unit/ashldi3_test.c
View File

@@ -19,9 +19,9 @@
// Precondition: 0 <= b < bits_in_dword // Precondition: 0 <= b < bits_in_dword
COMPILER_RT_ABI di_int __ashldi3(di_int a, si_int b); COMPILER_RT_ABI di_int __ashldi3(di_int a, int b);
int test__ashldi3(di_int a, si_int b, di_int expected) int test__ashldi3(di_int a, int b, di_int expected)
{ {
di_int x = __ashldi3(a, b); di_int x = __ashldi3(a, b);
if (x != expected) if (x != expected)

4
compiler-rt/test/builtins/Unit/ashrdi3_test.c
View File

@@ -19,9 +19,9 @@
// Precondition: 0 <= b < bits_in_dword // Precondition: 0 <= b < bits_in_dword
COMPILER_RT_ABI di_int __ashrdi3(di_int a, si_int b); COMPILER_RT_ABI di_int __ashrdi3(di_int a, int b);
int test__ashrdi3(di_int a, si_int b, di_int expected) int test__ashrdi3(di_int a, int b, di_int expected)
{ {
di_int x = __ashrdi3(a, b); di_int x = __ashrdi3(a, b);
if (x != expected) if (x != expected)

6
compiler-rt/test/builtins/Unit/ctzdi2_test.c
View File

@@ -19,11 +19,11 @@
// Precondition: a != 0 // Precondition: a != 0
COMPILER_RT_ABI si_int __ctzdi2(di_int a); COMPILER_RT_ABI int __ctzdi2(di_int a);
int test__ctzdi2(di_int a, si_int expected) int test__ctzdi2(di_int a, int expected)
{ {
si_int x = __ctzdi2(a); int x = __ctzdi2(a);
if (x != expected) if (x != expected)
printf("error in __ctzdi2(0x%llX) = %d, expected %d\n", a, x, expected); printf("error in __ctzdi2(0x%llX) = %d, expected %d\n", a, x, expected);
return x != expected; return x != expected;

6
compiler-rt/test/builtins/Unit/ffsdi2_test.c
View File

@@ -18,11 +18,11 @@
// Returns: the index of the least significant 1-bit in a, or // Returns: the index of the least significant 1-bit in a, or
// the value zero if a is zero. The least significant bit is index one. // the value zero if a is zero. The least significant bit is index one.
COMPILER_RT_ABI si_int __ffsdi2(di_int a); COMPILER_RT_ABI int __ffsdi2(di_int a);
int test__ffsdi2(di_int a, si_int expected) int test__ffsdi2(di_int a, int expected)
{ {
si_int x = __ffsdi2(a); int x = __ffsdi2(a);
if (x != expected) if (x != expected)
printf("error in __ffsdi2(0x%llX) = %d, expected %d\n", a, x, expected); printf("error in __ffsdi2(0x%llX) = %d, expected %d\n", a, x, expected);
return x != expected; return x != expected;

6
compiler-rt/test/builtins/Unit/ffssi2_test.c
View File

@@ -18,11 +18,11 @@
// Returns: the index of the least significant 1-bit in a, or // Returns: the index of the least significant 1-bit in a, or
// the value zero if a is zero. The least significant bit is index one. // the value zero if a is zero. The least significant bit is index one.
COMPILER_RT_ABI si_int __ffssi2(si_int a); COMPILER_RT_ABI int __ffssi2(si_int a);
int test__ffssi2(si_int a, si_int expected) int test__ffssi2(si_int a, int expected)
{ {
si_int x = __ffssi2(a); int x = __ffssi2(a);
if (x != expected) if (x != expected)
printf("error in __ffssi2(0x%X) = %d, expected %d\n", a, x, expected); printf("error in __ffssi2(0x%X) = %d, expected %d\n", a, x, expected);
return x != expected; return x != expected;

4
compiler-rt/test/builtins/Unit/lshrdi3_test.c
View File

@@ -19,9 +19,9 @@
// Precondition: 0 <= b < bits_in_dword // Precondition: 0 <= b < bits_in_dword
COMPILER_RT_ABI di_int __lshrdi3(di_int a, si_int b); COMPILER_RT_ABI di_int __lshrdi3(di_int a, int b);
int test__lshrdi3(di_int a, si_int b, di_int expected) int test__lshrdi3(di_int a, int b, di_int expected)
{ {
di_int x = __lshrdi3(a, b); di_int x = __lshrdi3(a, b);
if (x != expected) if (x != expected)

6
compiler-rt/test/builtins/Unit/popcountdi2_test.c
View File

@@ -18,7 +18,7 @@
// Returns: count of 1 bits // Returns: count of 1 bits
COMPILER_RT_ABI si_int __popcountdi2(di_int a); COMPILER_RT_ABI int __popcountdi2(di_int a);
int naive_popcount(di_int a) int naive_popcount(di_int a)
{ {
@@ -30,8 +30,8 @@ int naive_popcount(di_int a)
int test__popcountdi2(di_int a) int test__popcountdi2(di_int a)
{ {
si_int x = __popcountdi2(a); int x = __popcountdi2(a);
si_int expected = naive_popcount(a); int expected = naive_popcount(a);
if (x != expected) if (x != expected)
printf("error in __popcountdi2(0x%llX) = %d, expected %d\n", printf("error in __popcountdi2(0x%llX) = %d, expected %d\n",
a, x, expected); a, x, expected);