Merge from 'sycl' to 'sycl-web' (18 commits)

Author: iclsrc

libclc/CMakeLists.txt

@@ -260,6 +260,7 @@ endif()
 find_package( Python3 REQUIRED COMPONENTS Interpreter )
 file( TO_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/utils/gen_convert.py script_loc )
 file( TO_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libspirv/lib/generic/gen_convert.py spirv_script_loc )
+file( TO_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libspirv/lib/generic/gen_convert_common.py spirv_common_script_loc )
 add_custom_command(
   OUTPUT convert.cl
   COMMAND ${Python3_EXECUTABLE} ${script_loc} > convert.cl
@@ -277,7 +278,7 @@ set_target_properties( generate-clc-convert.cl PROPERTIES FOLDER "libclc/Sourceg
 add_custom_command(
   OUTPUT spirv-convert.cl
   COMMAND ${Python3_EXECUTABLE} ${spirv_script_loc} > spirv-convert.cl
-  DEPENDS ${spirv_script_loc} )
+  DEPENDS ${spirv_script_loc} ${spirv_common_script_loc} )
 add_custom_target( generate-spirv-convert.cl DEPENDS spirv-convert.cl )
 set_target_properties( generate-spirv-convert.cl PROPERTIES FOLDER "libclc/Sourcegenning" )
 

libclc/generic/gen_convert_common.py

@@ -18,8 +18,6 @@
 
 from os.path import dirname, join, abspath
 
-sys.path.insert(0, abspath(join(dirname(__file__), "..", "..", "..", "generic")))
-
 from gen_convert_common import (
     types,
     int_types,

libclc/libspirv/lib/generic/gen_convert.py

@@ -0,0 +1,156 @@
+# This file contains common variables and helper functions used by the
+# `gen_convert.py` in both the libclc and libspirv libraries.
+
+types = [
+    "char",
+    "schar",
+    "uchar",
+    "short",
+    "ushort",
+    "int",
+    "uint",
+    "long",
+    "ulong",
+    "half",
+    "float",
+    "double",
+]
+int_types = [
+    "char",
+    "schar",
+    "uchar",
+    "short",
+    "ushort",
+    "int",
+    "uint",
+    "long",
+    "ulong",
+]
+unsigned_types = ["uchar", "ushort", "uint", "ulong"]
+signed_types = ["char", "schar", "short", "int", "long"]
+float_types = ["half", "float", "double"]
+int64_types = ["long", "ulong"]
+float64_types = ["double"]
+float16_types = ["half"]
+vector_sizes = ["", "2", "3", "4", "8", "16"]
+half_sizes = [("2", ""), ("4", "2"), ("8", "4"), ("16", "8")]
+
+saturation = ["", "_sat"]
+rounding_modes = ["_rtz", "_rte", "_rtp", "_rtn"]
+float_prefix = {"float": "FLT_", "double": "DBL_"}
+float_suffix = {"float": "f", "double": ""}
+
+bool_type = {
+    "char": "char",
+    "schar": "schar",
+    "uchar": "schar",
+    "short": "short",
+    "ushort": "short",
+    "int": "int",
+    "uint": "int",
+    "long": "long",
+    "ulong": "long",
+    "half": "short",
+    "float": "int",
+    "double": "long",
+}
+
+unsigned_type = {
+    "char": "uchar",
+    "schar": "uchar",
+    "uchar": "uchar",
+    "short": "ushort",
+    "ushort": "ushort",
+    "int": "uint",
+    "uint": "uint",
+    "long": "ulong",
+    "ulong": "ulong",
+}
+
+sizeof_type = {
+    "char": 1,
+    "schar": 1,
+    "uchar": 1,
+    "short": 2,
+    "ushort": 2,
+    "int": 4,
+    "uint": 4,
+    "long": 8,
+    "ulong": 8,
+    "half": 2,
+    "float": 4,
+    "double": 8,
+}
+
+limit_max = {
+    "char": "CHAR_MAX",
+    "schar": "CHAR_MAX",
+    "uchar": "UCHAR_MAX",
+    "short": "SHRT_MAX",
+    "ushort": "USHRT_MAX",
+    "int": "INT_MAX",
+    "uint": "UINT_MAX",
+    "long": "LONG_MAX",
+    "ulong": "ULONG_MAX",
+    "half": "0x1.ffcp+15",
+}
+
+limit_min = {
+    "char": "CHAR_MIN",
+    "schar": "CHAR_MIN",
+    "uchar": "0",
+    "short": "SHRT_MIN",
+    "ushort": "0",
+    "int": "INT_MIN",
+    "uint": "0",
+    "long": "LONG_MIN",
+    "ulong": "0",
+    "half": "-0x1.ffcp+15",
+}
+
+
+def conditional_guard(src, dst):
+    """
+    This function will optionally print a header guard for `cl_khr_fp64` if a 64-bit type is used
+    as the source or destination and return a bool that indicates whether this guard will need
+    closed after the calling function has finished printing functions that use the 64-bit
+    source/destination type.
+    """
+    int64_count = 0
+    float64_count = 0
+    float16_count = 0
+    if src in int64_types or dst in int64_types:
+        int64_count = 1
+    if src in float64_types or dst in float64_types:
+        float64_count = 1
+    if src in float16_types or dst in float16_types:
+        float16_count = 1
+    if float16_count > 0:
+        print("#ifdef cl_khr_fp16")
+    if float64_count > 0:
+        # In embedded profile, if cl_khr_fp64 is supported cles_khr_int64 has to be
+        print("#ifdef cl_khr_fp64")
+        return 1 + float16_count
+    elif int64_count > 0:
+        print("#if defined cles_khr_int64 || !defined(__EMBEDDED_PROFILE__)")
+        return 1 + float16_count
+    return float16_count
+
+
+def close_conditional_guard(close_conditional):
+    """
+    This function will close conditional guard opened by conditional_guard.
+    """
+    for _ in range(close_conditional):
+        print("#endif")
+
+
+def clc_core_fn_name(dst, size="", mode="", sat=""):
+    """
+    This helper function returns the correct clc core conversion function name
+    for a given source and destination type, with optional size, mode
+    and saturation arguments.
+    """
+    return "__clc_convert_{DST}{N}{SAT}{MODE}".format(
+        DST=dst, N=size, SAT=sat, MODE=mode
+    )