Skip to content

Commit

Permalink
Merge branch 'frexp' of https://github.com/isuruf/pocl
Browse files Browse the repository at this point in the history
  • Loading branch information
pjaaskel committed Jun 9, 2020
2 parents a297e7d + 4a8cb03 commit b641922
Show file tree
Hide file tree
Showing 7 changed files with 286 additions and 4 deletions.
18 changes: 14 additions & 4 deletions lib/CL/devices/cuda/pocl-ptx-gen.cc
Original file line number Diff line number Diff line change
Expand Up @@ -848,11 +848,21 @@ void mapLibDeviceCalls(llvm::Module *Module) {
{"llvm.powi.f32", "__nv_powif"},
{"llvm.powi.f64", "__nv_powi"},

// TODO: frexp
// TODO: ldexp
{"frexp", "__nv_frexp"},
{"frexpf", "__nv_frexpf"},

{"tgamma", "__nv_tgamma"},
{"tgammaf", "__nv_tgammaf"},

{"ldexp", "__nv_ldexp"},
{"ldexpf", "__nv_ldexpf"},

{"modf", "__nv_modf"},
{"modff", "__nv_modff"},

{"remquo", "__nv_remquo"},
{"remquof", "__nv_remquof"},
// TODO: lgamma_r
// TODO: modf
// TODO: remquo
// TODO: rootn
};
// clang-format on
Expand Down
3 changes: 3 additions & 0 deletions lib/kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ fmax.cl
fmin.cl
fmod.cl
fract.cl
frexp.cl
get_global_id.c
get_global_offset.c
get_global_size.c
Expand Down Expand Up @@ -116,6 +117,7 @@ mad_sat.cl
max.cl
max_i.cl
maxmag.cl
modf.cl
min.cl
min_i.cl
minmag.cl
Expand Down Expand Up @@ -151,6 +153,7 @@ printf_base.c
radians.cl
recip.cl
remainder.cl
remquo.cl
rhadd.cl
rint.cl
rootn.cl
Expand Down
26 changes: 26 additions & 0 deletions lib/kernel/frexp.cl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* OpenCL built-in library: frexp
Copyright (c) 2020 Isuru Fernando
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
*/

#include "templates.h"

DEFINE_BUILTIN_V_VPJ (frexp)
26 changes: 26 additions & 0 deletions lib/kernel/modf.cl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* OpenCL built-in library: modf
Copyright (c) 2020 Isuru Fernando
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
*/

#include "templates.h"

DEFINE_BUILTIN_V_VPV (modf)
26 changes: 26 additions & 0 deletions lib/kernel/remquo.cl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* OpenCL built-in library: remquo
Copyright (c) 2020 Isuru Fernando
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
*/

#include "templates.h"

DEFINE_BUILTIN_V_VVPJ (remquo)
189 changes: 189 additions & 0 deletions lib/kernel/templates.h
Original file line number Diff line number Diff line change
Expand Up @@ -1853,6 +1853,195 @@
IMPLEMENT_EXPR_J_JJJ(NAME, EXPR, uint8 , uint , uint8 , uint ) \
IMPLEMENT_EXPR_J_JJJ(NAME, EXPR, uint16 , uint , uint16 , uint )

/* Defines an OpenCL builtin function for all floating point
gentypes and addressspaces using Clang scalar builtins. */
#define IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE(NAME, VTYPE, ADDRSPACE) \
VTYPE __attribute__ ((overloadable)) NAME (VTYPE a, ADDRSPACE VTYPE *b) \
{ \
__private VTYPE c; \
__private VTYPE r = NAME (a, &c); \
*b = c; \
return r; \
}

#define IMPLEMENT_BUILTIN_V_VPV(NAME, VTYPE, LTYPE, HTYPE, LO, HI) \
VTYPE __attribute__ ((overloadable)) NAME (VTYPE a, VTYPE *b) \
{ \
LTYPE c = b->LO; \
HTYPE d = b->HI; \
VTYPE r = (VTYPE) (NAME (a.LO, &c), NAME (a.HI, &d)); \
b->LO = c; \
b->HI = d; \
return r; \
} \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, VTYPE, __local) \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, VTYPE, __global)
#define DEFINE_BUILTIN_V_VPV(NAME) \
__IF_FP16 ( \
half _CL_OVERLOADABLE _CL_READNONE NAME (half a, __private half *b) \
{ \
/* use float builtin */ \
__private float c; \
__private float r = __builtin_##NAME##f (a, &c); \
*b = c; \
return r; \
} \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, half, __local) \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, half, __global) \
IMPLEMENT_BUILTIN_V_VPV (NAME, half2, half, half, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, half3, half2, half, lo, s2) \
IMPLEMENT_BUILTIN_V_VPV (NAME, half4, half2, half2, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, half8, half4, half4, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, half16, half8, half8, lo, hi)) \
float _CL_OVERLOADABLE _CL_READNONE NAME (float a, __private float *b) \
{ \
return __builtin_##NAME##f (a, b); \
} \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, float, __local) \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, float, __global) \
IMPLEMENT_BUILTIN_V_VPV (NAME, float2, float, float, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, float3, float2, float, lo, s2) \
IMPLEMENT_BUILTIN_V_VPV (NAME, float4, float2, float2, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, float8, float4, float4, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, float16, float8, float8, lo, hi) \
__IF_FP64 ( \
double _CL_OVERLOADABLE _CL_READNONE NAME (double a, __private double *b) \
{ \
return __builtin_##NAME (a, b); \
} \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, double, __local) \
IMPLEMENT_BUILTIN_V_VPV_ADDRSPACE (NAME, double, __global) \
IMPLEMENT_BUILTIN_V_VPV (NAME, double2, double, double, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, double3, double2, double, lo, s2) \
IMPLEMENT_BUILTIN_V_VPV (NAME, double4, double2, double2, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, double8, double4, double4, lo, hi) \
IMPLEMENT_BUILTIN_V_VPV (NAME, double16, double8, double8, lo, hi))

#define IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE(NAME, VTYPE, JTYPE, ADDRSPACE) \
VTYPE __attribute__ ((overloadable)) \
NAME (VTYPE a, VTYPE b, ADDRSPACE JTYPE *c) \
{ \
__private JTYPE d; \
__private VTYPE r = NAME (a, b, &d); \
*c = d; \
return r; \
}

#define IMPLEMENT_BUILTIN_V_VVPJ(NAME, VTYPE, JTYPE, LTYPE, HTYPE, LO, HI) \
VTYPE __attribute__ ((overloadable)) NAME (VTYPE a, VTYPE b, JTYPE *c) \
{ \
LTYPE d = c->LO; \
HTYPE e = c->HI; \
VTYPE r = (VTYPE) (NAME (a.LO, b.LO, &d), NAME (a.HI, b.HI, &e)); \
c->LO = d; \
c->HI = e; \
return r; \
} \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, VTYPE, JTYPE, __local) \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, VTYPE, JTYPE, __global)
#define DEFINE_BUILTIN_V_VVPJ(NAME) \
__IF_FP16 ( \
half _CL_OVERLOADABLE _CL_READNONE NAME (half a, half b, int *c) \
{ \
/* use float builtin */ \
__private int d; \
__private float r = __builtin_##NAME##f (a, b, &d); \
*c = d; \
return r; \
} \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, half, int, __local) \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, half, int, __global) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, half2, int2, int, int, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, half3, int3, int2, int, lo, s2) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, half4, int4, int2, int2, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, half8, int8, int4, int4, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, half16, int16, int8, int8, lo, hi)) \
float _CL_OVERLOADABLE _CL_READNONE NAME (float a, float b, int *c) \
{ \
return __builtin_##NAME##f (a, b, c); \
} \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, float, int, __local) \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, float, int, __global) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, float2, int2, int, int, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, float3, int3, int2, int, lo, s2) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, float4, int4, int2, int2, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, float8, int8, int4, int4, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, float16, int16, int8, int8, lo, hi) \
__IF_FP64 ( \
double _CL_OVERLOADABLE _CL_READNONE NAME (double a, double b, int *c) \
{ \
return __builtin_##NAME (a, b, c); \
} \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, double, int, __local) \
IMPLEMENT_BUILTIN_V_VVPJ_ADDRSPACE (NAME, double, int, __global) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, double2, int2, int, int, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, double3, int3, int2, int, lo, s2) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, double4, int4, int2, int2, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, double8, int8, int4, int4, lo, hi) \
IMPLEMENT_BUILTIN_V_VVPJ (NAME, double16, int16, int8, int8, lo, hi))

#define IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE(NAME, VTYPE, JTYPE, ADDRSPACE) \
VTYPE __attribute__ ((overloadable)) NAME (VTYPE a, ADDRSPACE JTYPE *c) \
{ \
__private JTYPE d; \
__private VTYPE r = NAME (a, &d); \
*c = d; \
return r; \
}

#define IMPLEMENT_BUILTIN_V_VPJ(NAME, VTYPE, JTYPE, LTYPE, HTYPE, LO, HI) \
VTYPE __attribute__ ((overloadable)) NAME (VTYPE a, JTYPE *c) \
{ \
LTYPE d = c->LO; \
HTYPE e = c->HI; \
VTYPE r = (VTYPE) (NAME (a.LO, &d), NAME (a.HI, &e)); \
c->LO = d; \
c->HI = e; \
return r; \
} \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, VTYPE, JTYPE, __local) \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, VTYPE, JTYPE, __global)
#define DEFINE_BUILTIN_V_VPJ(NAME) \
__IF_FP16 ( \
half _CL_OVERLOADABLE _CL_READNONE NAME (half a, int *c) \
{ \
/* use float builtin */ \
__private int d; \
__private float r = __builtin_##NAME##f (a, &d); \
*c = d; \
return r; \
} \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, half, int, __local) \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, half, int, __global) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, half2, int2, int, int, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, half3, int3, int2, int, lo, s2) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, half4, int4, int2, int2, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, half8, int8, int4, int4, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, half16, int16, int8, int8, lo, hi)) \
float _CL_OVERLOADABLE _CL_READNONE NAME (float a, int *c) \
{ \
return __builtin_##NAME##f (a, c); \
} \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, float, int, __local) \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, float, int, __global) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, float2, int2, int, int, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, float3, int3, int2, int, lo, s2) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, float4, int4, int2, int2, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, float8, int8, int4, int4, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, float16, int16, int8, int8, lo, hi) \
__IF_FP64 ( \
double _CL_OVERLOADABLE _CL_READNONE NAME (double a, int *c) \
{ \
return __builtin_##NAME (a, c); \
} \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, double, int, __local) \
IMPLEMENT_BUILTIN_V_VPJ_ADDRSPACE (NAME, double, int, __global) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, double2, int2, int, int, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, double3, int3, int2, int, lo, s2) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, double4, int4, int2, int2, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, double8, int8, int4, int4, lo, hi) \
IMPLEMENT_BUILTIN_V_VPJ (NAME, double16, int16, int8, int8, lo, hi))

#define __SINGLE_WI \
if (get_local_id(0) == 0 && \
get_local_id(1) == 0 && \
Expand Down
2 changes: 2 additions & 0 deletions tests/kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,10 @@ set_tests_properties("kernel/test_shuffle_char"
if(ENABLE_CUDA)
set_property(TEST
"kernel/test_min_max"
"kernel/test_ldexp"
"kernel/test_length_distance"
"kernel/test_fmin_fmax_fma"
"kernel/test_frexp_modf"
"kernel/test_convert_sat_regression"
"kernel/test_rotate"
"kernel/test_short16"
Expand Down

0 comments on commit b641922

Please sign in to comment.