DPCTL_ENABLE_LO_PROGRAM_CREATION -> DPCTL_ENABLE_L0_PROGRAM_CREATION

oleksandr-pavlyk · oleksandr-pavlyk · commit 6f45f30fd40f · 2022-04-19T20:03:32.000-05:00
diff --git a/.github/workflows/generate-coverage.yaml b/.github/workflows/generate-coverage.yaml
@@ -92,7 +92,7 @@ jobs:
               -DCMAKE_BUILD_TYPE=Debug                                             \
               -DCMAKE_C_COMPILER:PATH=icx                                          \
               -DCMAKE_CXX_COMPILER:PATH=icpx                                       \
-              -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON                                \
+              -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON                                \
               -DDPCTL_GENERATE_COVERAGE=ON                                         \
               -DDPCTL_BUILD_CAPI_TESTS=ON                                          \
               -DDPCTL_COVERAGE_REPORT_OUTPUT_DIR=$(pwd)
diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
@@ -68,7 +68,7 @@ jobs:
               -DCMAKE_BUILD_TYPE=Debug                     \
               -DCMAKE_C_COMPILER:PATH=icx                  \
               -DCMAKE_CXX_COMPILER:PATH=icpx               \
-              -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON        \
+              -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON        \
               -DDPCTL_GENERATE_DOCS=ON                     \
               -DDPCTL_ENABLE_DOXYREST=ON                   \
               -DDoxyrest_DIR=`pwd`/doxyrest-2.1.2-linux-amd64
diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml
@@ -97,6 +97,6 @@ jobs:
           export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
           clang++ --version
           sycl-ls
-          python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++ -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=$(dirname $(dirname $(which clang))) -DDPCTL_DPCPP_FROM_ONEAPI=OFF
+          python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++ -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=$(dirname $(dirname $(which clang))) -DDPCTL_DPCPP_FROM_ONEAPI=OFF
           python -c "import dpctl; dpctl.lsplatform()" || exit 1
           SYCL_ENABLE_HOST_DEVICE=1 python -m pytest -v dpctl/tests
diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
@@ -4,7 +4,7 @@ set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
 set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
 
 "%PYTHON%" setup.py clean --all
-set "SKBUILD_ARGS=-- -G Ninja -DDPCTL_DPCPP_HOME_DIR=%BUILD_PREFIX%\Library -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON"
+set "SKBUILD_ARGS=-- -G Ninja -DDPCTL_DPCPP_HOME_DIR=%BUILD_PREFIX%\Library -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON"
 set "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\14.0.0"
 
 set "PLATFORM_DIR=%PREFIX%\Library\share\cmake-3.22\Modules\Platform"
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
@@ -7,7 +7,7 @@ export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
 
 ${PYTHON} setup.py clean --all
 export CMAKE_GENERATOR="Ninja"
-SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=${BUILD_PREFIX}"
+SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=${BUILD_PREFIX}"
 echo "${PYTHON} setup.py install ${SKBUILD_ARGS}"
 
 # Workaround for:
diff --git a/docs/docfiles/user_guides/QuickStart.rst b/docs/docfiles/user_guides/QuickStart.rst
@@ -152,13 +152,13 @@ Once the prerequisites are installed, building using ``scikit-build`` involves t
 
 .. code-block:: bash
 
-    python setup.py install -- -G Ninja -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON
+    python setup.py install -- -G Ninja -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON
 
 , and to develop:
 
 .. code-block:: bash
 
-    python setup.py develop -G Ninja -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON
+    python setup.py develop -G Ninja -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON
 
 On Windows, use ``icx`` for both C and CXX compilers.
 
@@ -180,7 +180,7 @@ Following steps in `Build and install with scikit-build`_ use command line optio
 
 .. code-block:: bash
 
-    python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++ -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ONE -DDPCTL_DPCPP_HOME_DIR=${DPCPP_ROOT}/llvm/build -DDPCTL_DPCPP_FROM_ONEAPI=OFF
+    python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++ -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=${DPCPP_ROOT}/llvm/build -DDPCTL_DPCPP_FROM_ONEAPI=OFF
 
 Alterantively, the driver script can be used
 
@@ -264,7 +264,7 @@ library.
         -DDPCPP_INSTALL_DIR=${DPCPP_ROOT}                       \
         -DCMAKE_C_COMPILER:PATH=${DPCPP_ROOT}/bin/icx           \
         -DCMAKE_CXX_COMPILER:PATH=${DPCPP_ROOT}/bin/dpcpp       \
-        -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON                   \
+        -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON                   \
         -DDPCTL_BUILD_CAPI_TESTS=ON                             \
         ..
 
diff --git a/libsyclinterface/CMakeLists.txt b/libsyclinterface/CMakeLists.txt
@@ -19,7 +19,7 @@ option(DPCTL_DPCPP_FROM_ONEAPI
 )
 # Option to turn on support for creating Level Zero interoperability programs
 # from a SPIR-V binary file.
-option(DPCTL_ENABLE_LO_PROGRAM_CREATION
+option(DPCTL_ENABLE_L0_PROGRAM_CREATION
     "Enable Level Zero Program creation from SPIR-V"
     OFF
 )
@@ -51,8 +51,8 @@ else()
     find_package(IntelSycl REQUIRED)
 endif()
 
-if(DPCTL_ENABLE_LO_PROGRAM_CREATION)
-    set(DPCTL_ENABLE_LO_PROGRAM_CREATION 1)
+if(DPCTL_ENABLE_L0_PROGRAM_CREATION)
+    set(DPCTL_ENABLE_L0_PROGRAM_CREATION 1)
     include(GetLevelZeroHeaders)
     get_level_zero_headers()
     if (UNIX)
@@ -231,7 +231,7 @@ set_target_properties(DPCTLSyclInterface
         SOVERSION ${VERSION_MAJOR}
 )
 
-if(DPCTL_ENABLE_LO_PROGRAM_CREATION)
+if(DPCTL_ENABLE_L0_PROGRAM_CREATION)
     target_include_directories(DPCTLSyclInterface
         PRIVATE
         ${LEVEL_ZERO_INCLUDE_DIR}
diff --git a/libsyclinterface/dbg_build.sh b/libsyclinterface/dbg_build.sh
@@ -13,7 +13,7 @@ cmake                                                       \
     -DCMAKE_CXX_COMPILER=dpcpp                              \
     -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}                \
     -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX}                   \
-    -DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON                   \
+    -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON                   \
     -DDPCTL_BUILD_CAPI_TESTS=ON                             \
     -DDPCTL_GENERATE_COVERAGE=ON                            \
     ..
diff --git a/libsyclinterface/dbg_build_custom.sh b/libsyclinterface/dbg_build_custom.sh
@@ -17,7 +17,7 @@ cmake                                                       \
     -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX}                   \
     -DDPCTL_CUSTOM_DPCPP_INSTALL_DIR=${DPCPP_HOME}          \
     -DCMAKE_LINKER:PATH=${DPCPP_HOME}/bin/lld               \
-    -DDPCTL_ENABLE_LO_PROGRAM_CREATION=${USE_LO_HEADERS}    \
+    -DDPCTL_ENABLE_L0_PROGRAM_CREATION=${USE_LO_HEADERS}    \
     -DDPCTL_BUILD_CAPI_TESTS=ON                             \
     -DDPCTL_GENERATE_COVERAGE=ON                            \
     ..
diff --git a/libsyclinterface/include/Config/dpctl_config.h.in b/libsyclinterface/include/Config/dpctl_config.h.in
@@ -26,7 +26,7 @@
 #pragma once
 
 /* Defined when dpctl was built with level zero program creation enabled. */
-#cmakedefine DPCTL_ENABLE_LO_PROGRAM_CREATION @DPCTL_ENABLE_LO_PROGRAM_CREATION@
+#cmakedefine DPCTL_ENABLE_L0_PROGRAM_CREATION @DPCTL_ENABLE_L0_PROGRAM_CREATION@
 
 /* The DPCPP version used to build dpctl */
 #define DPCTL_DPCPP_VERSION "@IntelSycl_VERSION@"
diff --git a/libsyclinterface/source/dpctl_sycl_program_interface.cpp b/libsyclinterface/source/dpctl_sycl_program_interface.cpp
@@ -38,7 +38,7 @@
 #include <CL/sycl/backend/opencl.hpp>
 #include <sstream>
 
-#ifdef DPCTL_ENABLE_LO_PROGRAM_CREATION
+#ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
 #include "dpctl_dynamic_lib_helper.h"
 // Note: include ze_api.h before level_zero.hpp. Make sure clang-format does
 // not reorder the includes.
@@ -52,7 +52,7 @@ using namespace cl::sycl;
 
 namespace
 {
-#ifdef DPCTL_ENABLE_LO_PROGRAM_CREATION
+#ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
 
 #ifdef __linux__
 static const char *zeLoaderName = DPCTL_LIBZE_LOADER_FILENAME;
@@ -72,7 +72,7 @@ typedef ze_result_t (*zeModuleCreateFT)(ze_context_handle_t,
 
 const char *zeModuleCreateFuncName = "zeModuleCreate";
 
-#endif // #ifdef DPCTL_ENABLE_LO_PROGRAM_CREATION
+#endif // #ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
 
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(context, DPCTLSyclContextRef)
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(program, DPCTLSyclProgramRef)
@@ -125,7 +125,7 @@ createOpenCLInterOpProgram(const context &SyclCtx,
     }
 }
 
-#ifdef DPCTL_ENABLE_LO_PROGRAM_CREATION
+#ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
 
 zeModuleCreateFT getZeModuleCreateFn()
 {
@@ -200,7 +200,7 @@ createLevelZeroInterOpProgram(const context &SyclCtx,
         return nullptr;
     }
 }
-#endif /* #ifdef DPCTL_ENABLE_LO_PROGRAM_CREATION */
+#endif /* #ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION */
 
 } /* end of anonymous namespace */
 
@@ -226,7 +226,7 @@ DPCTLProgram_CreateFromSpirv(__dpctl_keep const DPCTLSyclContextRef CtxRef,
         Pref = createOpenCLInterOpProgram(*SyclCtx, IL, length, CompileOpts);
         break;
     case backend::ext_oneapi_level_zero:
-#ifdef DPCTL_ENABLE_LO_PROGRAM_CREATION
+#ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
         Pref = createLevelZeroInterOpProgram(*SyclCtx, IL, length, CompileOpts);
 #endif
         break;
diff --git a/libsyclinterface/tests/test_sycl_program_interface.cpp b/libsyclinterface/tests/test_sycl_program_interface.cpp
@@ -230,7 +230,7 @@ INSTANTIATE_TEST_SUITE_P(ProgramCreationFromSpriv,
                                            "opencl:gpu",
                                            "opencl:cpu",
                                            "opencl:gpu:0",
-#ifdef DPCTL_ENABLE_LO_PROGRAM_CREATION
+#ifdef DPCTL_ENABLE_L0_PROGRAM_CREATION
                                            "level_zero",
                                            "level_zero:gpu",
 #endif
diff --git a/scripts/build_backend.py b/scripts/build_backend.py
diff --git a/scripts/build_locally.py b/scripts/build_locally.py
diff --git a/scripts/gen_coverage.py b/scripts/gen_coverage.py
diff --git a/scripts/gen_docs.py b/scripts/gen_docs.py
