Rename offline compiler: cloc -> ocloc

Change-Id: I0595bac4c7266e77bd2ee17588694233547c8315

Author: AdamCetnerowski

CMakeLists.txt

@@ -613,7 +613,7 @@ else()
 endif(MSVC)
 
 add_subdirectory(offline_compiler ${IGDRCL_BUILD_DIR}/offline_compiler)
-target_compile_definitions(cloc PRIVATE MOCKABLE_VIRTUAL=)
+target_compile_definitions(ocloc PRIVATE MOCKABLE_VIRTUAL=)
 
 macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
 	set(NEO_STATIC_LIB_NAME ${LIB_NAME})

offline_compiler/CMakeLists.txt

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-project(cloc)
+project(ocloc)
 
 set(CLOC_SRCS_LIB
 ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
@@ -69,10 +69,10 @@ set(CLOC_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
 )
-add_executable(cloc ${CLOC_SRCS})
+add_executable(ocloc ${CLOC_SRCS})
 add_subdirectories()
 
-create_project_source_tree(cloc ${IGDRCL_SOURCE_DIR}/runtime)
+create_project_source_tree(ocloc ${IGDRCL_SOURCE_DIR}/runtime)
 
 set(CLOC_INCLUDES
   ${IGC_OCL_ADAPTOR_DIR}
@@ -85,22 +85,22 @@ set(CLOC_INCLUDES
   ${THIRD_PARTY_DIR}
 )
 
-target_include_directories(cloc BEFORE PRIVATE ${CLOC_INCLUDES})
+target_include_directories(ocloc BEFORE PRIVATE ${CLOC_INCLUDES})
 
-target_compile_definitions(cloc PUBLIC ${CLOC_LIB_FLAGS_DEFINITIONS} ${SUPPORTED_GEN_FLAGS_DEFINITONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM})
+target_compile_definitions(ocloc PUBLIC ${CLOC_LIB_FLAGS_DEFINITIONS} ${SUPPORTED_GEN_FLAGS_DEFINITONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM})
 
 if(MSVC)
-  target_link_libraries(cloc dbghelp)
+  target_link_libraries(ocloc dbghelp)
 endif()
 
 if(UNIX)
-  target_link_libraries(cloc dl pthread)
+  target_link_libraries(ocloc dl pthread)
 endif()
 
-target_link_libraries(cloc elflib)
+target_link_libraries(ocloc elflib)
 
-set_target_properties(cloc PROPERTIES FOLDER "offline_compiler")
-set_property(TARGET cloc APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
+set_target_properties(ocloc PROPERTIES FOLDER "offline_compiler")
+set_property(TARGET ocloc APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
 
 add_custom_target(copy_compiler_files DEPENDS ${IGDRCL__IGC_TARGETS})
 set_target_properties(copy_compiler_files PROPERTIES FOLDER "opencl runtime")
@@ -109,7 +109,7 @@ foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
   add_custom_command(
     TARGET copy_compiler_files
     PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${TARGET_tmp}> $<TARGET_FILE_DIR:cloc>
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${TARGET_tmp}> $<TARGET_FILE_DIR:ocloc>
 )
 endforeach()
 

offline_compiler/offline_compiler.cpp

@@ -620,7 +620,7 @@ std::string getDevicesTypes() {
 void OfflineCompiler::printUsage() {
 
     printf("Compiles CL files into llvm (.bc or .ll), gen isa (.gen), and binary files (.bin)\n\n");
-    printf("cloc -file <filename> -device <device_type> [OPTIONS]\n\n");
+    printf("ocloc -file <filename> -device <device_type> [OPTIONS]\n\n");
     printf("  -file <filename>             Indicates the CL kernel file to be compiled.\n");
     printf("  -device <device_type>        Indicates which device for which we will compile.\n");
     printf("                               <device_type> can be: %s\n", getDevicesTypes().c_str());

offline_compiler/utilities/CMakeLists.txt

@@ -22,4 +22,4 @@ else()
   )
 endif()
 
-target_sources(cloc PRIVATE ${CLOC_SRCS_UTILITIES})
+target_sources(ocloc PRIVATE ${CLOC_SRCS_UTILITIES})

runtime/built_ins/kernels/CMakeLists.txt

@@ -22,7 +22,7 @@ endif()
 set(BUILTINS_INCLUDE_DIR ${TargetDir} PARENT_SCOPE)
 set(BUILTIN_CPP "")
 
-# Define function for compiling built-ins (with cloc)
+# Define function for compiling built-ins (with ocloc)
 function(compile_builtin gen_type platform_type builtin)
   string(TOLOWER ${gen_type} gen_type_lower)
   get_family_name_with_type(${gen_type} ${platform_type})
@@ -51,20 +51,20 @@ function(compile_builtin gen_type platform_type builtin)
   # set variable outside function
   set(BUILTIN_CPP built_ins/${NEO_ARCH}/${gen_type_lower}/${BASENAME}_${family_name_with_type}.cpp PARENT_SCOPE)
   if(WIN32)
-    set(cloc_cmd_prefix cloc)
+    set(cloc_cmd_prefix ocloc)
   else()
     if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-      set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:cloc>)
+      set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
     else()
-      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:cloc> $<TARGET_FILE:cloc>)
+      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
     endif()
   endif()
   list(APPEND __cloc__options__ "-cl-kernel-arg-info")
   add_custom_command(
     OUTPUT ${OUTPUT_FILES}
     COMMAND ${cloc_cmd_prefix} -q -file ${FILENAME} -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} ${BUILTIN_OPTIONS} -${NEO_BITS} -out_dir ${OUTPUTDIR} -cpp_file -options "$<JOIN:${__cloc__options__}, >"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${builtin} cloc copy_compiler_files
+    DEPENDS ${builtin} ocloc copy_compiler_files
   )
 endfunction()
 

runtime/scheduler/scheduler_binary.cmake

@@ -32,12 +32,12 @@ function(compile_kernel target gen_type platform_type kernel)
 
   set(SCHEDULER_CPP "${OUTPUTDIR}/${BASENAME}_${family_name_with_type}.cpp")
   if(WIN32)
-    set(cloc_cmd_prefix cloc)
+    set(cloc_cmd_prefix ocloc)
   else()
     if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-      set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:cloc>)
+      set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
     else()
-      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:cloc> $<TARGET_FILE:cloc>)
+      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
     endif()
   endif()
   list(APPEND __cloc__options__ "-cl-kernel-arg-info")
@@ -46,7 +46,7 @@ function(compile_kernel target gen_type platform_type kernel)
     OUTPUT ${OUTPUTPATH}
     COMMAND ${cloc_cmd_prefix} -q -file ${kernel} -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} -cl-intel-greater-than-4GB-buffer-required -${NEO_BITS} -out_dir ${OUTPUTDIR} -cpp_file -options "$<JOIN:${__cloc__options__}, >"
     WORKING_DIRECTORY  ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${kernel} cloc copy_compiler_files
+    DEPENDS ${kernel} ocloc copy_compiler_files
   )
   set(SCHEDULER_CPP ${SCHEDULER_CPP} PARENT_SCOPE)
 

ubsan.supp

@@ -1,2 +1,2 @@
 vptr:std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release()
-vptr:cloc
+vptr:ocloc

unit_tests/CMakeLists.txt

@@ -162,13 +162,13 @@ set_target_properties(run_unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 target_include_directories(igdrcl_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common${BRANCH_DIR_SUFFIX})
 
 if(WIN32)
-  set(cloc_cmd_prefix cloc)
+  set(cloc_cmd_prefix ocloc)
   set(ir_extension ".spv")
 else()
   if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-    set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:cloc>)
+    set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
   else()
-    set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:cloc> $<TARGET_FILE:cloc>)
+    set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
   endif()
   set(ir_extension ".bc")
 endif()
@@ -193,7 +193,7 @@ function(neo_gen_kernels target platform_name suffix)
       OUTPUT ${output_files}
       COMMAND ${cloc_cmd_prefix} -q -file ${filename} -device ${platform_name} -${NEO_BITS} -out_dir ${outputdir}
       WORKING_DIRECTORY ${workdir}
-      DEPENDS ${filepath} cloc
+      DEPENDS ${filepath} ocloc
     )
 
     list(APPEND results ${output_files})
@@ -226,7 +226,7 @@ function(neo_gen_kernels_with_options target platform_name suffix filepath)
         OUTPUT ${output_files}
         COMMAND ${cloc_cmd_prefix} -q -file ${filename} -device ${platform_name} -${NEO_BITS} -out_dir ${outputdir} -options ${arg} -options_name
         WORKING_DIRECTORY ${workdir}
-        DEPENDS ${filearg} cloc
+        DEPENDS ${filearg} ocloc
       )
 
       list(APPEND results ${output_files})
@@ -263,7 +263,7 @@ function(neo_gen_kernel_with_kernel_debug_options target platform_name suffix fi
     OUTPUT ${output_files}
     COMMAND ${cloc_cmd_prefix} -q -file ${filename} -device ${platform_name} -${NEO_BITS} -out_dir ${outputdir} -output ${argwospaces} -internal_options ${TEST_KERNEL_kernel_debug_enable} -options "-g"
     WORKING_DIRECTORY ${workdir}
-    DEPENDS ${filepath} cloc
+    DEPENDS ${filepath} ocloc
   )
 
   list(APPEND results ${output_files})
@@ -290,7 +290,7 @@ function(neo_gen_kernel_from_ll target platform_name suffix filepath output_name
     OUTPUT ${output_files}
     COMMAND ${cloc_cmd_prefix} -q -file ${filename} -output ${output_name} -device ${platform_name} -${NEO_BITS} -out_dir ${outputdir} -internal_options ${compile_options} -llvm_input
     WORKING_DIRECTORY ${workdir}
-    DEPENDS ${filepath} cloc
+    DEPENDS ${filepath} ocloc
   )
 
   list(APPEND results ${output_files})

unit_tests/offline_compiler/CMakeLists.txt

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-project(cloc_tests)
+project(ocloc_tests)
 
 set(IGDRCL_SRCS_cloc
 ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
@@ -48,38 +48,38 @@ endif()
 
 link_directories(${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
-add_executable(cloc_tests ${IGDRCL_SRCS_offline_compiler_tests})
+add_executable(ocloc_tests ${IGDRCL_SRCS_offline_compiler_tests})
 
-target_include_directories(cloc_tests PRIVATE
-  $<TARGET_PROPERTY:cloc,INCLUDE_DIRECTORIES>
+target_include_directories(ocloc_tests PRIVATE
+  $<TARGET_PROPERTY:ocloc,INCLUDE_DIRECTORIES>
 )
-target_compile_definitions(cloc_tests PUBLIC MOCKABLE_VIRTUAL=virtual $<TARGET_PROPERTY:cloc,INTERFACE_COMPILE_DEFINITIONS>)
+target_compile_definitions(ocloc_tests PUBLIC MOCKABLE_VIRTUAL=virtual $<TARGET_PROPERTY:ocloc,INTERFACE_COMPILE_DEFINITIONS>)
 
-target_link_libraries(cloc_tests igdrcl_mocks gmock-gtest elflib)
+target_link_libraries(ocloc_tests igdrcl_mocks gmock-gtest elflib)
 
 if(UNIX)
-  target_link_libraries(cloc_tests dl pthread)
+  target_link_libraries(ocloc_tests dl pthread)
 endif()
 
-get_property(CLOC_FOLDER TARGET cloc PROPERTY FOLDER)
-get_property(CLOC_COMPILE_FLAGS TARGET cloc PROPERTY COMPILE_FLAGS)
-set_property(TARGET cloc_tests PROPERTY FOLDER ${CLOC_FOLDER})
-set_property(TARGET cloc_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${CLOC_COMPILE_FLAGS})
+get_property(CLOC_FOLDER TARGET ocloc PROPERTY FOLDER)
+get_property(CLOC_COMPILE_FLAGS TARGET ocloc PROPERTY COMPILE_FLAGS)
+set_property(TARGET ocloc_tests PROPERTY FOLDER ${CLOC_FOLDER})
+set_property(TARGET ocloc_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${CLOC_COMPILE_FLAGS})
 
 string(TOLOWER ${DEFAULT_TESTED_PLATFORM} CLOC_DEFAULT_DEVICE)
 
-add_custom_target(run_cloc_tests ALL
-  DEPENDS cloc_tests
+add_custom_target(run_ocloc_tests ALL
+  DEPENDS ocloc_tests
 )
 macro(macro_for_each_platform)
   if("${PLATFORM_IT_LOWER}" STREQUAL "${CLOC_DEFAULT_DEVICE}")
     foreach(PLATFORM_TYPE "CORE" "LP")
       if(${PLATFORM_IT}_IS_${PLATFORM_TYPE})
         get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE})
-        add_dependencies(run_cloc_tests test_kernels_${family_name_with_type})
+        add_dependencies(run_ocloc_tests test_kernels_${family_name_with_type})
         neo_copy_test_files(copy_test_files_${family_name_with_type} ${family_name_with_type})	
-        add_dependencies(run_cloc_tests copy_test_files_${family_name_with_type})
-        set(run_tests_cmd cloc_tests --device ${CLOC_DEFAULT_DEVICE} --family_type ${family_name_with_type})
+        add_dependencies(run_ocloc_tests copy_test_files_${family_name_with_type})
+        set(run_tests_cmd ocloc_tests --device ${CLOC_DEFAULT_DEVICE} --family_type ${family_name_with_type})
       endif()
     endforeach()
   endif()
@@ -89,11 +89,11 @@ macro(macro_for_each_gen)
 endmacro()
 apply_macro_for_each_gen("TESTED")
 
-set_property(TARGET run_cloc_tests PROPERTY FOLDER ${CLOC_FOLDER})
+set_property(TARGET run_ocloc_tests PROPERTY FOLDER ${CLOC_FOLDER})
 
 if(WIN32)
   add_custom_command(
-    TARGET run_cloc_tests
+    TARGET run_ocloc_tests
     POST_BUILD
     COMMAND echo deleting offline compiler files and directories...
     COMMAND ${CMAKE_COMMAND} -E remove ${TargetDir}/${CLOC_DEFAULT_DEVICE}/copybuffer_${CLOC_DEFAULT_DEVICE}.bc
@@ -105,7 +105,7 @@ if(WIN32)
   )
 else()
   add_custom_command(
-    TARGET run_cloc_tests
+    TARGET run_ocloc_tests
     POST_BUILD
     COMMAND echo deleting offline compiler files and directories...
     COMMAND ${CMAKE_COMMAND} -E remove ${TargetDir}/${CLOC_DEFAULT_DEVICE}/*.bc
@@ -119,4 +119,4 @@ else()
 endif()
 
 add_subdirectories()
-create_project_source_tree(cloc_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests ${IGDRCL_SOURCE_DIR})
+create_project_source_tree(ocloc_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests ${IGDRCL_SOURCE_DIR})

unit_tests/offline_compiler/decoder/decoder_tests.cpp

@@ -29,7 +29,7 @@ SKernelBinaryHeaderCommon createKernelBinaryHeaderCommon(const uint32_t kernelNa
 namespace OCLRT {
 TEST(DecoderTests, WhenParsingValidListOfParametersThenReturnValueIsZero) {
     const char *argv[] = {
-        "cloc",
+        "ocloc",
         "decoder",
         "-file",
         "test_files/binary.bin",
@@ -44,7 +44,7 @@ TEST(DecoderTests, WhenParsingValidListOfParametersThenReturnValueIsZero) {
 
 TEST(DecoderTests, WhenMissingParametersThenValidateInputReturnsErrorCode) {
     const char *argv[] = {
-        "cloc",
+        "ocloc",
         "decoder",
         "-file",
         "test_files/binary.bin",