[Beignet] [PATCH] CMake: Add OCL20 env for utest

Xiuli Pan xiuli.pan at intel.com
Fri Dec 30 06:12:43 UTC 2016


From: Pan Xiuli <xiuli.pan at intel.com>

We need to set env for OpenCL 2.0 in utest.

Signed-off-by: Pan Xiuli <xiuli.pan at intel.com>
---
 backend/CMakeLists.txt | 2 ++
 utests/setenv.sh.in    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
index 57df8a5..d2d8710 100644
--- a/backend/CMakeLists.txt
+++ b/backend/CMakeLists.txt
@@ -48,6 +48,8 @@ set(LOCAL_OCL_HEADER_DIR "${LOCAL_OCL_HEADER_DIR}" PARENT_SCOPE)
 set(LOCAL_OCL_PCH_OBJECT "${LOCAL_OCL_PCH_OBJECT}" PARENT_SCOPE)
 set(LOCAL_GBE_OBJECT_DIR ${LOCAL_GBE_OBJECT_DIR} PARENT_SCOPE)
 set(LOCAL_INTERP_OBJECT_DIR ${LOCAL_INTERP_OBJECT_DIR} PARENT_SCOPE)
+set(LOCAL_OCL_BITCODE_BIN_20 "${LOCAL_OCL_BITCODE_BIN_20}" PARENT_SCOPE)
+set(LOCAL_OCL_PCH_OBJECT_20 "${LOCAL_OCL_PCH_OBJECT_20}" PARENT_SCOPE)
 
 set (GBE_BIN_GENERATER
      env OCL_BITCODE_LIB_PATH=${LOCAL_OCL_BITCODE_BIN} OCL_HEADER_FILE_DIR=${LOCAL_OCL_HEADER_DIR} OCL_PCH_PATH=${LOCAL_OCL_PCH_OBJECT}
diff --git a/utests/setenv.sh.in b/utests/setenv.sh.in
index 67e3bf1..e1282df 100644
--- a/utests/setenv.sh.in
+++ b/utests/setenv.sh.in
@@ -2,7 +2,9 @@
 #
 export OCL_BITCODE_LIB_PATH=@LOCAL_OCL_BITCODE_BIN@
 export OCL_HEADER_FILE_DIR=@LOCAL_OCL_HEADER_DIR@
+export OCL_BITCODE_LIB_20_PATH=@LOCAL_OCL_BITCODE_BIN_20@
 export OCL_PCH_PATH=@LOCAL_OCL_PCH_OBJECT@
+export OCL_PCH_20_PATH=@LOCAL_OCL_PCH_OBJECT_20@
 export OCL_KERNEL_PATH=@CMAKE_CURRENT_SOURCE_DIR@/../kernels
 export OCL_GBE_PATH=@LOCAL_GBE_OBJECT_DIR@
 export OCL_INTERP_PATH=@LOCAL_INTERP_OBJECT_DIR@
-- 
2.7.4



More information about the Beignet mailing list