This is an archive of the discontinued LLVM Phabricator instance.

Differential D146960

[builtins] Support architectures with 16-bit int in __ashlti3, __ashrti3 and __lshrti3
ClosedPublic

Authored by Ka-Ka on Mar 27 2023, 6:58 AM.

Details

Reviewers
aykevl
MaskRay
phosek
efriedma
Commits
rG3834b0467ddc: [builtins] Support architectures with 16-bit int in __ashlti3, __ashrti3 and…
Summary

The amount to shift should be specified by the int type not a 32-bit integer
type.

This patch change the functions for 128-bit shifts in compiler-rt the same way
as was done for 64-bit shifts in D78662.

The README.txt is updated with the shift builtins signatures from this patch and D78662.

Diff Detail

Event Timeline

Ka-Ka created this revision.Mar 27 2023, 6:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 27 2023, 6:58 AM
Herald added a subscriber: Enna1. · View Herald Transcript
Ka-Ka requested review of this revision.Mar 27 2023, 6:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 27 2023, 6:58 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B222000: Diff 508636.Mar 27 2023, 7:22 AM
bjope added a subscriber: bjope.Mar 28 2023, 1:03 AM
Ka-Ka updated this revision to Diff 509616.Mar 30 2023, 4:47 AM

git-clang-format

Harbormaster completed remote builds in B222706: Diff 509616.Mar 30 2023, 5:05 AM
efriedma accepted this revision.Mar 30 2023, 10:52 AM

LGTM

This revision is now accepted and ready to land.Mar 30 2023, 10:52 AM
Closed by commit rG3834b0467ddc: [builtins] Support architectures with 16-bit int in __ashlti3, __ashrti3 and… (authored by Ka-Ka). · Explain WhyMar 30 2023, 10:09 PM
This revision was automatically updated to reflect the committed changes.
Ka-Ka added a commit: rG3834b0467ddc: [builtins] Support architectures with 16-bit int in __ashlti3, __ashrti3 and….

Revision Contents

PathSize
compiler-rt/
lib/
builtins/
12 lines
2 lines
2 lines
2 lines
test/
builtins/
Unit/
40 lines
36 lines
36 lines

Diff 509616

compiler-rt/lib/builtins/README.txt

Show All 29 Lines
typedef int32_t si_int; typedef int32_t si_int;
typedef uint32_t su_int; typedef uint32_t su_int;
typedef int64_t di_int; typedef int64_t di_int;
typedef uint64_t du_int; typedef uint64_t du_int;
// Integral bit manipulation // Integral bit manipulation
di_int __ashldi3(di_int a, si_int b); // a << b di_int __ashldi3(di_int a, int b); // a << b
ti_int __ashlti3(ti_int a, si_int b); // a << b ti_int __ashlti3(ti_int a, int b); // a << b
di_int __ashrdi3(di_int a, si_int b); // a >> b arithmetic (sign fill) di_int __ashrdi3(di_int a, int b); // a >> b arithmetic (sign fill)
ti_int __ashrti3(ti_int a, si_int b); // a >> b arithmetic (sign fill) ti_int __ashrti3(ti_int a, int b); // a >> b arithmetic (sign fill)
di_int __lshrdi3(di_int a, si_int b); // a >> b logical (zero fill) di_int __lshrdi3(di_int a, int b); // a >> b logical (zero fill)
ti_int __lshrti3(ti_int a, si_int b); // a >> b logical (zero fill) ti_int __lshrti3(ti_int a, int b); // a >> b logical (zero fill)
int __clzsi2(si_int a); // count leading zeros int __clzsi2(si_int a); // count leading zeros
int __clzdi2(di_int a); // count leading zeros int __clzdi2(di_int a); // count leading zeros
int __clzti2(ti_int a); // count leading zeros int __clzti2(ti_int a); // count leading zeros
int __ctzsi2(si_int a); // count trailing zeros int __ctzsi2(si_int a); // count trailing zeros
int __ctzdi2(di_int a); // count trailing zeros int __ctzdi2(di_int a); // count trailing zeros
int __ctzti2(ti_int a); // count trailing zeros int __ctzti2(ti_int a); // count trailing zeros
▲ Show 20 Lines • Show All 301 Lines • Show Last 20 Lines

compiler-rt/lib/builtins/ashlti3.c

Show All 12 Lines
#include "int_lib.h" #include "int_lib.h"
#ifdef CRT_HAS_128BIT #ifdef CRT_HAS_128BIT
// Returns: a << b // Returns: a << b
// Precondition: 0 <= b < bits_in_tword // Precondition: 0 <= b < bits_in_tword
COMPILER_RT_ABI ti_int __ashlti3(ti_int a, si_int b) { COMPILER_RT_ABI ti_int __ashlti3(ti_int a, int b) {
const int bits_in_dword = (int)(sizeof(di_int) * CHAR_BIT); const int bits_in_dword = (int)(sizeof(di_int) * CHAR_BIT);
twords input; twords input;
twords result; twords result;
input.all = a; input.all = a;
if (b & bits_in_dword) /* bits_in_dword <= b < bits_in_tword */ { if (b & bits_in_dword) /* bits_in_dword <= b < bits_in_tword */ {
result.s.low = 0; result.s.low = 0;
result.s.high = input.s.low << (b - bits_in_dword); result.s.high = input.s.low << (b - bits_in_dword);
} else /* 0 <= b < bits_in_dword */ { } else /* 0 <= b < bits_in_dword */ {
Show All 9 Lines

compiler-rt/lib/builtins/ashrti3.c

Show All 12 Lines
#include "int_lib.h" #include "int_lib.h"
#ifdef CRT_HAS_128BIT #ifdef CRT_HAS_128BIT
// Returns: arithmetic a >> b // Returns: arithmetic a >> b
// Precondition: 0 <= b < bits_in_tword // Precondition: 0 <= b < bits_in_tword
COMPILER_RT_ABI ti_int __ashrti3(ti_int a, si_int b) { COMPILER_RT_ABI ti_int __ashrti3(ti_int a, int b) {
const int bits_in_dword = (int)(sizeof(di_int) * CHAR_BIT); const int bits_in_dword = (int)(sizeof(di_int) * CHAR_BIT);
twords input; twords input;
twords result; twords result;
input.all = a; input.all = a;
if (b & bits_in_dword) /* bits_in_dword <= b < bits_in_tword */ { if (b & bits_in_dword) /* bits_in_dword <= b < bits_in_tword */ {
// result.s.high = input.s.high < 0 ? -1 : 0 // result.s.high = input.s.high < 0 ? -1 : 0
result.s.high = input.s.high >> (bits_in_dword - 1); result.s.high = input.s.high >> (bits_in_dword - 1);
result.s.low = input.s.high >> (b - bits_in_dword); result.s.low = input.s.high >> (b - bits_in_dword);
Show All 10 Lines

compiler-rt/lib/builtins/lshrti3.c

Show All 12 Lines
#include "int_lib.h" #include "int_lib.h"
#ifdef CRT_HAS_128BIT #ifdef CRT_HAS_128BIT
// Returns: logical a >> b // Returns: logical a >> b
// Precondition: 0 <= b < bits_in_tword // Precondition: 0 <= b < bits_in_tword
COMPILER_RT_ABI ti_int __lshrti3(ti_int a, si_int b) { COMPILER_RT_ABI ti_int __lshrti3(ti_int a, int b) {
const int bits_in_dword = (int)(sizeof(di_int) * CHAR_BIT); const int bits_in_dword = (int)(sizeof(di_int) * CHAR_BIT);
utwords input; utwords input;
utwords result; utwords result;
input.all = a; input.all = a;
if (b & bits_in_dword) /* bits_in_dword <= b < bits_in_tword */ { if (b & bits_in_dword) /* bits_in_dword <= b < bits_in_tword */ {
result.s.high = 0; result.s.high = 0;
result.s.low = input.s.high >> (b - bits_in_dword); result.s.low = input.s.high >> (b - bits_in_dword);
} else /* 0 <= b < bits_in_dword */ { } else /* 0 <= b < bits_in_dword */ {
Show All 9 Lines

compiler-rt/test/builtins/Unit/ashlti3_test.c

// RUN: %clang_builtins %s %librt -o %t && %run %t // RUN: %clang_builtins %s %librt -o %t && %run %t
// REQUIRES: librt_has_ashlti3 // REQUIRES: librt_has_ashlti3
// REQUIRES: int128 // REQUIRES: int128
#include "int_lib.h" #include "int_lib.h"
#include <stdio.h> #include <stdio.h>
#ifdef CRT_HAS_128BIT #ifdef CRT_HAS_128BIT
// Returns: a << b // Returns: a << b
// Precondition: 0 <= b < bits_in_tword // Precondition: 0 <= b < bits_in_tword
COMPILER_RT_ABI ti_int __ashlti3(ti_int a, si_int b); COMPILER_RT_ABI ti_int __ashlti3(ti_int a, int b);
int test__ashlti3(ti_int a, si_int b, ti_int expected) int test__ashlti3(ti_int a, int b, ti_int expected) {
{
ti_int x = __ashlti3(a, b); ti_int x = __ashlti3(a, b);
if (x != expected) if (x != expected) {
{
twords at; twords at;
at.all = a; at.all = a;
twords bt; twords bt;
bt.all = b; bt.all = b;
twords xt; twords xt;
xt.all = x; xt.all = x;
twords expectedt; twords expectedt;
expectedt.all = expected; expectedt.all = expected;
printf("error in __ashlti3: 0x%llX%.16llX << %d = 0x%llX%.16llX," printf("error in __ashlti3: 0x%llX%.16llX << %d = 0x%llX%.16llX,"
" expected 0x%llX%.16llX\n", " expected 0x%llX%.16llX\n",
at.s.high, at.s.low, b, xt.s.high, xt.s.low, at.s.high, at.s.low, b, xt.s.high, xt.s.low, expectedt.s.high,
expectedt.s.high, expectedt.s.low); expectedt.s.low);
} }
return x != expected; return x != expected;
} }
char assumption_1[sizeof(ti_int) == 2*sizeof(di_int)] = {0}; char assumption_1[sizeof(ti_int) == 2*sizeof(di_int)] = {0};
#endif #endif
int main() int main()
{ {
▲ Show 20 Lines • Show All 124 Lines • Show Last 20 Lines

compiler-rt/test/builtins/Unit/ashrti3_test.c

// RUN: %clang_builtins %s %librt -o %t && %run %t // RUN: %clang_builtins %s %librt -o %t && %run %t
// REQUIRES: librt_has_ashrti3 // REQUIRES: librt_has_ashrti3
// REQUIRES: int128 // REQUIRES: int128
#include "int_lib.h" #include "int_lib.h"
#include <stdio.h> #include <stdio.h>
#ifdef CRT_HAS_128BIT #ifdef CRT_HAS_128BIT
// Returns: arithmetic a >> b // Returns: arithmetic a >> b
// Precondition: 0 <= b < bits_in_tword // Precondition: 0 <= b < bits_in_tword
COMPILER_RT_ABI ti_int __ashrti3(ti_int a, si_int b); COMPILER_RT_ABI ti_int __ashrti3(ti_int a, int b);
int test__ashrti3(ti_int a, si_int b, ti_int expected) int test__ashrti3(ti_int a, int b, ti_int expected) {
{
ti_int x = __ashrti3(a, b); ti_int x = __ashrti3(a, b);
if (x != expected) if (x != expected) {
{
twords at; twords at;
at.all = a; at.all = a;
twords xt; twords xt;
xt.all = x; xt.all = x;
twords expectedt; twords expectedt;
expectedt.all = expected; expectedt.all = expected;
printf("error in __ashrti3: 0x%llX%.16llX >> %d = 0x%llX%.16llX," printf("error in __ashrti3: 0x%llX%.16llX >> %d = 0x%llX%.16llX,"
" expected 0x%llX%.16llX\n", " expected 0x%llX%.16llX\n",
at.s.high, at.s.low, b, xt.s.high, xt.s.low, at.s.high, at.s.low, b, xt.s.high, xt.s.low, expectedt.s.high,
expectedt.s.high, expectedt.s.low); expectedt.s.low);
} }
return x != expected; return x != expected;
} }
char assumption_1[sizeof(ti_int) == 2*sizeof(di_int)] = {0}; char assumption_1[sizeof(ti_int) == 2*sizeof(di_int)] = {0};
#endif #endif
int main() int main()
{ {
▲ Show 20 Lines • Show All 124 Lines • Show Last 20 Lines

compiler-rt/test/builtins/Unit/lshrti3_test.c

// RUN: %clang_builtins %s %librt -o %t && %run %t // RUN: %clang_builtins %s %librt -o %t && %run %t
// REQUIRES: librt_has_lshrti3 // REQUIRES: librt_has_lshrti3
// REQUIRES: int128 // REQUIRES: int128
#include "int_lib.h" #include "int_lib.h"
#include <stdio.h> #include <stdio.h>
#ifdef CRT_HAS_128BIT #ifdef CRT_HAS_128BIT
// Returns: logical a >> b // Returns: logical a >> b
// Precondition: 0 <= b < bits_in_dword // Precondition: 0 <= b < bits_in_dword
COMPILER_RT_ABI ti_int __lshrti3(ti_int a, si_int b); COMPILER_RT_ABI ti_int __lshrti3(ti_int a, int b);
int test__lshrti3(ti_int a, si_int b, ti_int expected) int test__lshrti3(ti_int a, int b, ti_int expected) {
{
ti_int x = __lshrti3(a, b); ti_int x = __lshrti3(a, b);
if (x != expected) if (x != expected) {
{
twords at; twords at;
at.all = a; at.all = a;
twords xt; twords xt;
xt.all = x; xt.all = x;
twords expectedt; twords expectedt;
expectedt.all = expected; expectedt.all = expected;
printf("error in __lshrti3: 0x%llX%.16llX >> %d = 0x%llX%.16llX," printf("error in __lshrti3: 0x%llX%.16llX >> %d = 0x%llX%.16llX,"
" expected 0x%llX%.16llX\n", " expected 0x%llX%.16llX\n",
at.s.high, at.s.low, b, xt.s.high, xt.s.low, at.s.high, at.s.low, b, xt.s.high, xt.s.low, expectedt.s.high,
expectedt.s.high, expectedt.s.low); expectedt.s.low);
} }
return x != expected; return x != expected;
} }
char assumption_1[sizeof(ti_int) == 2*sizeof(di_int)] = {0}; char assumption_1[sizeof(ti_int) == 2*sizeof(di_int)] = {0};
#endif #endif
int main() int main()
{ {
▲ Show 20 Lines • Show All 124 Lines • Show Last 20 Lines