diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2012-05-29 13:35:54 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2012-05-29 13:35:54 +0000 |
| commit | 9acfba3322a9e2f4766ff79d105098f407c6a9d3 (patch) | |
| tree | 9da02e45e4d8e62a067899044466c1f6dcce1b96 /libclc | |
| parent | 20a5813a5f611ee32249615d26ccf607f6cf4252 (diff) | |
| download | bcm5719-llvm-9acfba3322a9e2f4766ff79d105098f407c6a9d3.tar.gz bcm5719-llvm-9acfba3322a9e2f4766ff79d105098f407c6a9d3.zip | |
Enable cl_khr_fp64 when building the library, and fix several bugs
uncovered when doing so.
llvm-svn: 157617
Diffstat (limited to 'libclc')
| -rwxr-xr-x | libclc/compile-test.sh | 2 | ||||
| -rwxr-xr-x | libclc/configure.py | 1 | ||||
| -rw-r--r-- | libclc/generic/lib/geometric/length.cl | 4 | ||||
| -rw-r--r-- | libclc/generic/lib/geometric/length.inc | 2 | ||||
| -rw-r--r-- | libclc/generic/lib/geometric/normalize.cl | 4 | ||||
| -rw-r--r-- | libclc/generic/lib/math/mad.cl | 4 |
6 files changed, 15 insertions, 2 deletions
diff --git a/libclc/compile-test.sh b/libclc/compile-test.sh index d0f4bb4a451..74618110d5a 100755 --- a/libclc/compile-test.sh +++ b/libclc/compile-test.sh @@ -1,3 +1,3 @@ #!/bin/sh -clang -ccc-host-triple nvptx--nvidiacl -Iptx-nvidiacl/include -Igeneric/include -Xclang -mlink-bitcode-file -Xclang nvptx--nvidiacl/lib/builtins.bc -include clc/clc.h -Dcl_clang_storage_class_specifiers "$@" +clang -ccc-host-triple nvptx--nvidiacl -Iptx-nvidiacl/include -Igeneric/include -Xclang -mlink-bitcode-file -Xclang nvptx--nvidiacl/lib/builtins.bc -include clc/clc.h -Dcl_clang_storage_class_specifiers -Dcl_khr_fp64 "$@" diff --git a/libclc/configure.py b/libclc/configure.py index 829ce6b0818..ab84a0d4263 100755 --- a/libclc/configure.py +++ b/libclc/configure.py @@ -93,6 +93,7 @@ for target in targets: # The rule for building a .bc file for the specified architecture using clang. clang_bc_flags = "-ccc-host-triple %s -I`dirname $in` %s " \ "-Dcl_clang_storage_class_specifiers " \ + "-Dcl_khr_fp64 " \ "-emit-llvm" % (target, clang_cl_includes) clang_bc_rule = "CLANG_CL_BC_" + target c_compiler_rule(b, clang_bc_rule, "LLVM-CC", llvm_clang, clang_bc_flags) diff --git a/libclc/generic/lib/geometric/length.cl b/libclc/generic/lib/geometric/length.cl index 957fbfdea0d..cbe84a0308e 100644 --- a/libclc/generic/lib/geometric/length.cl +++ b/libclc/generic/lib/geometric/length.cl @@ -1,4 +1,8 @@ #include <clc/clc.h> +#ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable +#endif + #define BODY "length.inc" #include <clc/geometric/floatn.inc> diff --git a/libclc/generic/lib/geometric/length.inc b/libclc/generic/lib/geometric/length.inc index 66d160475aa..494789c033b 100644 --- a/libclc/generic/lib/geometric/length.inc +++ b/libclc/generic/lib/geometric/length.inc @@ -1,3 +1,3 @@ -_CLC_OVERLOAD _CLC_DEF float length(FLOATN p) { +_CLC_OVERLOAD _CLC_DEF FLOAT length(FLOATN p) { return native_sqrt(dot(p, p)); } diff --git a/libclc/generic/lib/geometric/normalize.cl b/libclc/generic/lib/geometric/normalize.cl index 95d327cfa6d..e5a521fcdc4 100644 --- a/libclc/generic/lib/geometric/normalize.cl +++ b/libclc/generic/lib/geometric/normalize.cl @@ -1,4 +1,8 @@ #include <clc/clc.h> +#ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable +#endif + #define BODY "normalize.inc" #include <clc/geometric/floatn.inc> diff --git a/libclc/generic/lib/math/mad.cl b/libclc/generic/lib/math/mad.cl index ff0cdbbecf0..e66e2046bb9 100644 --- a/libclc/generic/lib/math/mad.cl +++ b/libclc/generic/lib/math/mad.cl @@ -1,4 +1,8 @@ #include <clc/clc.h> +#ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable +#endif + #define BODY <mad.inc> #include <clc/math/gentype.inc> |
