Don't use static const ints

backends/cuda/extract_base.rb

@@ -11,6 +11,8 @@ def shared_header
       #include <stdlib.h>
       #include <stdint.h>
       #define __CUDA_API_VERSION_INTERNAL=1
+      #define CU_COMPUTE_ACCELERATED_TARGET_BASE   0x10000
+      #define CU_TENSOR_MAP_NUM_QWORDS 16
     EOF
   end
 

backends/cuda/headers.patch

@@ -60,7 +60,7 @@ diff -u4 -r --new-file include/cuda.h modified_include/cuda.h
   * Indicates that compute device class supports accelerated features.
   */
 -#define CU_COMPUTE_ACCELERATED_TARGET_BASE   0x10000
-+static const int CU_COMPUTE_ACCELERATED_TARGET_BASE = 0x10000;
++//#define CU_COMPUTE_ACCELERATED_TARGET_BASE   0x10000
 
  /**
   * Online compilation targets
@@ -71,7 +71,7 @@ diff -u4 -r --new-file include/cuda.h modified_include/cuda.h
   * Size of tensor map descriptor
   */
 -#define CU_TENSOR_MAP_NUM_QWORDS 16
-+static const int CU_TENSOR_MAP_NUM_QWORDS = 16;
++//#define CU_TENSOR_MAP_NUM_QWORDS 16
 
  /**
   * Tensor map descriptor. Requires compiler support for aligning to 64 bytes.

backends/hip/extract_base.rb

@@ -14,6 +14,7 @@ def shared_header
       #include <stdint.h>
       #include <stddef.h>
       #define __HIP_PLATFORM_AMD__
+      #define HIP_IPC_HANDLE_SIZE 64
     EOF
   end
 else

backends/hip/headers.patch

@@ -317,7 +317,7 @@ diff -u4 -r --new-file include/hip/hip_runtime_api.h modified_include/hip/hip_ru
  typedef struct ihipStream_t* hipStream_t;
  #define hipIpcMemLazyEnablePeerAccess 0
 -#define HIP_IPC_HANDLE_SIZE 64
-+static const int HIP_IPC_HANDLE_SIZE = 64;
++//#define HIP_IPC_HANDLE_SIZE 64
  typedef struct hipIpcMemHandle_st {
      char reserved[HIP_IPC_HANDLE_SIZE];
  } hipIpcMemHandle_t;

backends/ze/extract_base.rb

@@ -8,23 +8,58 @@ def enable_clang_parser?
 
   def shared_header
     <<~EOF
-      #define ZE_MAKE_VERSION( _major, _minor )  (( _major << 16 )|( _minor & 0x0000ffff))
-      #define ZE_MAJOR_VERSION( _ver )  ( _ver >> 16 )
-      #define ZE_MINOR_VERSION( _ver )  ( _ver & 0x0000ffff )
-      #define ZE_BIT( _i )  ( 1 << _i )
-
       #include <stddef.h>
       #include <stdint.h>
       #include <stdbool.h>
 
       #include <ze_api.h>
       #include <ze_ddi.h>
+
+      #define ZEL_COMPONENT_STRING_SIZE 64
     EOF
   end
 else
 
   require 'cast-to-yaml'
 
+  constants = %w(
+    ZE_MAX_IPC_HANDLE_SIZE
+    ZE_MAX_UUID_SIZE
+    ZE_MAX_DRIVER_UUID_SIZE
+    ZE_MAX_EXTENSION_NAME
+    ZE_MAX_DEVICE_UUID_SIZE
+    ZE_MAX_DEVICE_NAME
+    ZE_SUBGROUPSIZE_COUNT
+    ZE_MAX_NATIVE_KERNEL_UUID_SIZE
+    ZE_MAX_KERNEL_UUID_SIZE
+    ZE_MAX_MODULE_UUID_SIZE
+    ZE_MAX_DEVICE_LUID_SIZE_EXT
+    ZE_MAX_FABRIC_EDGE_MODEL_EXP_SIZE
+    ZES_MAX_EXTENSION_NAME
+    ZES_STRING_PROPERTY_SIZE
+    ZES_MAX_UUID_SIZE
+    ZES_MAX_FABRIC_PORT_MODEL_SIZE
+    ZES_MAX_FABRIC_LINK_TYPE_SIZE
+    ZES_FAN_TEMP_SPEED_PAIR_COUNT
+    ZES_MAX_RAS_ERROR_CATEGORY_COUNT
+    ZET_MAX_METRIC_GROUP_NAME
+    ZET_MAX_METRIC_GROUP_DESCRIPTION
+    ZET_MAX_METRIC_NAME
+    ZET_MAX_METRIC_DESCRIPTION
+    ZET_MAX_METRIC_COMPONENT
+    ZET_MAX_METRIC_RESULT_UNITS
+    ZET_MAX_METRIC_EXPORT_DATA_ELEMENT_NAME_EXP
+    ZET_MAX_METRIC_EXPORT_DATA_ELEMENT_DESCRIPTION_EXP
+    ZET_MAX_PROGRAMMABLE_METRICS_ELEMENT_NAME_EXP
+    ZET_MAX_PROGRAMMABLE_METRICS_ELEMENT_DESCRIPTION_EXP
+    ZET_MAX_METRIC_PROGRAMMABLE_NAME_EXP
+    ZET_MAX_METRIC_PROGRAMMABLE_DESCRIPTION_EXP
+    ZET_MAX_METRIC_PROGRAMMABLE_COMPONENT_EXP
+    ZET_MAX_METRIC_PROGRAMMABLE_PARAMETER_NAME_EXP
+    ZET_MAX_VALUE_INFO_CSTRING_EXP
+    ZEL_COMPONENT_STRING_SIZE
+  )
+
   $parser = C::Parser.new
   $parser.type_names << '__builtin_va_list'
   $cpp = C::Preprocessor.new
@@ -35,6 +70,13 @@ def shared_header
   $cpp.macros['ZE_DLLEXPORT'] = ''
   $cpp.macros['ZE_APIEXPORT'] = ''
   $cpp.macros['__asm__(a)'] = ''
+  $cpp.macros['ZE_MAKE_VERSION( _major, _minor )'] = 'ZE_MAKE_VERSION( _major, _minor )'
+  $cpp.macros['ZE_MAJOR_VERSION( _ver )'] = 'ZE_MAJOR_VERSION( _ver )'
+  $cpp.macros['ZE_MINOR_VERSION( _ver )'] = 'ZE_MINOR_VERSION( _ver )'
+  $cpp.macros['ZE_BIT( _i )'] = 'ZE_BIT( _i )'
+  constants.each { |c|
+    $cpp.macros[c] = c
+  }
   $cpp.include_path << './modified_include/'
   begin
     preprocessed_sources_libc = $cpp.preprocess(<<~EOF).gsub(/^#.*?$/, '')

backends/ze/gen_ze_library.rb

@@ -201,6 +201,8 @@ module ZE
   ZE_MAX_IPC_HANDLE_SIZE = 64
   ZE_MAX_UUID_SIZE = 16
   ZE_MAX_DRIVER_UUID_SIZE = 16
+  ZE_MAX_EXTENSION_NAME = 256
+  ZE_MAX_DEVICE_UUID_SIZE = 16
   ZE_MAX_DEVICE_NAME = 256
   ZE_SUBGROUPSIZE_COUNT = 8
   ZE_MAX_NATIVE_KERNEL_UUID_SIZE = 16
@@ -215,6 +217,21 @@ module ZE
   ZES_MAX_FABRIC_LINK_TYPE_SIZE = 256
   ZES_FAN_TEMP_SPEED_PAIR_COUNT = 32
   ZES_MAX_RAS_ERROR_CATEGORY_COUNT = 7
+  ZET_MAX_METRIC_GROUP_NAME = 256
+  ZET_MAX_METRIC_GROUP_DESCRIPTION = 256
+  ZET_MAX_METRIC_NAME = 256
+  ZET_MAX_METRIC_DESCRIPTION = 256
+  ZET_MAX_METRIC_COMPONENT = 256
+  ZET_MAX_METRIC_RESULT_UNITS = 256
+  ZET_MAX_METRIC_EXPORT_DATA_ELEMENT_NAME_EXP = 256
+  ZET_MAX_METRIC_EXPORT_DATA_ELEMENT_DESCRIPTION_EXP = 256
+  ZET_MAX_PROGRAMMABLE_METRICS_ELEMENT_NAME_EXP = 256
+  ZET_MAX_PROGRAMMABLE_METRICS_ELEMENT_DESCRIPTION_EXP = 256
+  ZET_MAX_METRIC_PROGRAMMABLE_NAME_EXP = 128
+  ZET_MAX_METRIC_PROGRAMMABLE_DESCRIPTION_EXP = 128
+  ZET_MAX_METRIC_PROGRAMMABLE_COMPONENT_EXP = 128
+  ZET_MAX_METRIC_PROGRAMMABLE_PARAMETER_NAME_EXP = 128
+  ZET_MAX_VALUE_INFO_CSTRING_EXP = 128
   ZEL_COMPONENT_STRING_SIZE = 64
   extend FFI::Library