81 pass

Author: vickiegpt

ext/ze_runtime-sys/src/runner/ze_runner.c

@@ -192,76 +192,7 @@ ze_runner_result_t run_spirv_kernel(
 
     if (kern_result != ZE_RESULT_SUCCESS) {
         DEBUG_PRINT("Failed to create kernel: %d", kern_result);
-        
-        // Enhanced error reporting for kernel creation failure
-        DEBUG_PRINT("=== KERNEL CREATION ERROR DETAILS ===");
-        DEBUG_PRINT("Kernel name: %s", name);
-        DEBUG_PRINT("SPIR-V module size: %zu bytes", spirv_size);
-        
-        // Try to check if the kernel name exists in the module
-        // Note: Level Zero doesn't provide a direct way to enumerate kernel names
-        // This is left here as a comment for future enhancement if API adds this capability
-        /*
-        uint32_t kernel_count = 0;
-        ze_result_t count_result = zeModuleGetKernelNames(module, &kernel_count, NULL);
-        if (count_result == ZE_RESULT_SUCCESS && kernel_count > 0) {
-            DEBUG_PRINT("Module contains %d kernels", kernel_count);
-            
-            // Get kernel names
-            const char** kernel_names = (const char**)malloc(kernel_count * sizeof(const char*));
-            if (kernel_names) {
-                if (zeModuleGetKernelNames(module, &kernel_count, kernel_names) == ZE_RESULT_SUCCESS) {
-                    DEBUG_PRINT("Available kernels in module:");
-                    for (uint32_t i = 0; i < kernel_count; i++) {
-                        DEBUG_PRINT("  - %s", kernel_names[i]);
-                    }
-                }
-                free(kernel_names);
-            }
-        }
-        */
-        DEBUG_PRINT("Error details:");
-        
-        // Check error code specifics 
-        if (kern_result == ZE_RESULT_ERROR_INVALID_ARGUMENT) {
-            DEBUG_PRINT("  Error: Invalid argument (kernel descriptor or kernel handle is NULL)");
-        }
-        else if (kern_result == ZE_RESULT_ERROR_INVALID_KERNEL_NAME) {
-            DEBUG_PRINT("  Error: Invalid kernel name (kernel '%s' not found in module)", name);
-            
-            // Print the first few bytes of the SPIR-V for debugging
-            DEBUG_PRINT("SPIR-V header (first 16 bytes, if available):");
-            if (spirv_data && spirv_size >= 16) {
-                const unsigned char* data = (const unsigned char*)spirv_data;
-                DEBUG_PRINT("  %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X  %02X %02X %02X %02X",
-                    data[0], data[1], data[2], data[3], 
-                    data[4], data[5], data[6], data[7],
-                    data[8], data[9], data[10], data[11],
-                    data[12], data[13], data[14], data[15]);
-            }
-            
-            // Custom error code for kernel creation failure
-            // Forward a custom error code to identify kernel name issues
-            zeModuleDestroy(module);
-            zeCommandListDestroy(command_list);
-            zeContextDestroy(context);
-            free(devices);
-            free(drivers);
-            return 2013265937; // Custom error code for kernel name not found
-        }
-        else if (kern_result == ZE_RESULT_ERROR_MODULE_BUILD_FAILURE) {
-            DEBUG_PRINT("  Error: Module build failure");
-        }
-        else {
-            DEBUG_PRINT("  Error: Unknown error code: %d", kern_result);
-        }
-        
-        zeModuleDestroy(module);
-        zeCommandListDestroy(command_list);
-        zeContextDestroy(context);
-        free(devices);
-        free(drivers);
-        return ZE_RUNNER_ERROR_KERNEL;
+        return ZE_RUNNER_ERROR_KERNEL_EXECUTION;
     }
 
     DEBUG_PRINT("Kernel created successfully");

fix_spirv.sh

@@ -3,22 +3,45 @@ set -e
 LLVM_IR_FILE="$1"
 SPIRV_FILE="$2"
 STRIP_NAME=$(basename "$LLVM_IR_FILE" .ll)
-# Disassemble the LLVM IR
-llvm-dis-18 "$LLVM_IR_FILE" -o /tmp/temp$STRIP_NAME.ll
+
+# Create a temporary file
+TEMP_LL_FILE="/tmp/temp$STRIP_NAME.ll"
+
+# Check if the input file is already in text format
+if [[ "$LLVM_IR_FILE" == *.ll ]]; then
+  # Already in text format, just copy it
+  cp "$LLVM_IR_FILE" "$TEMP_LL_FILE"
+else
+  # Disassemble the LLVM IR
+  llvm-dis-18 "$LLVM_IR_FILE" -o "$TEMP_LL_FILE"
+fi
 
 # Fix address spaces - ensure all global variables have explicit address space 0
-sed -i -E 's/@_([0-9]+) = internal global/@_\1 = internal addrspace(1) global/g' /tmp/temp$STRIP_NAME.ll
-sed -i 's/addrspace(5)/addrspace(0)/g' /tmp/temp$STRIP_NAME.ll
-sed -i 's/addrspace(4) byref/addrspace(1) byref/g' /tmp/temp$STRIP_NAME.ll
-
-# 同时也需要修改加载这些参数的指令
-sed -i 's/load i64, ptr addrspace(4) %"\([0-9]\+\)", align/load i64, ptr addrspace(1) %"\1", align/g' /tmp/temp$STRIP_NAME.ll
-
-# 更新元数据中的函数签名（如果有）
-sed -i 's/!0 = !{.*ptr addrspace(4)/!0 = !{ptr @vector_extract, !"vector_extract"}/g' /tmp/temp$STRIP_NAME.ll
-sed -i 's/amdgpu_kernel/spir_kernel/g' /tmp/temp$STRIP_NAME.ll
-# 为inttoptr到addrspace(1)的每个实例创建新的变量序列
-sed -i 's/%"\([0-9]\+\)" = inttoptr \(.*\) to ptr addrspace(1)/%"\1_tmp" = inttoptr \2 to ptr addrspace(4)\n  %"\1" = addrspacecast ptr addrspace(4) %"\1_tmp" to ptr addrspace(1)/g' /tmp/temp$STRIP_NAME.ll
+sed -i -E 's/@_([0-9]+) = internal global/@_\1 = internal addrspace(1) global/g' "$TEMP_LL_FILE"
+sed -i 's/addrspace(5)/addrspace(0)/g' "$TEMP_LL_FILE"
+sed -i 's/addrspace(4) byref/addrspace(1) byref/g' "$TEMP_LL_FILE"
+
+# Update metadata for function signatures
+sed -i 's/amdgpu_kernel/spir_kernel/g' "$TEMP_LL_FILE"
+
+# Fix inttoptr to addrspace(1) conversions
+sed -i 's/%"\([0-9]\+\)" = inttoptr \(.*\) to ptr addrspace(1)/%"\1_tmp" = inttoptr \2 to ptr addrspace(4)\n  %"\1" = addrspacecast ptr addrspace(4) %"\1_tmp" to ptr addrspace(1)/g' "$TEMP_LL_FILE"
+
+# Fix the specific issue with direct addrspacecast from default address space to addrspace(1)
+# First replace pattern like:
+#   %2 = inttoptr i64 %"42" to ptr
+#   %"49" = addrspacecast ptr %2 to ptr addrspace(1)
+# Find all inttoptr without address space specification and add addrspace(0)
+sed -i 's/\(%[0-9]\+\) = inttoptr \(.*\) to ptr$/\1 = inttoptr \2 to ptr addrspace(0)/g' "$TEMP_LL_FILE"
+sed -i 's/\(%"[0-9]\+"\) = addrspacecast ptr \(%[0-9]\+\) to ptr/\1 = addrspacecast ptr addrspace(4) \2 to ptr/g' "$TEMP_LL_FILE"
+
+# Then find all addrspacecast from ptr to ptr addrspace(1) and replace with double cast through addrspace(0)
+sed -i 's/\(%"[0-9]\+"\) = addrspacecast ptr \(%[0-9]\+\) to ptr addrspace(1)/\1_gen = addrspacecast ptr addrspace(0) \2 to ptr addrspace(0)\n  \1 = addrspacecast ptr addrspace(0) \1_gen to ptr addrspace(1)/g' "$TEMP_LL_FILE"
+
+sed -i 's/\(%[0-9]\+\) = addrspacecast ptr addrspace(3) \(%"[0-9]\+"\) to ptr\n\(%[0-9]\+\) = addrspacecast ptr addrspace(3) \(%"[0-9]\+"\) to ptr/\1 = addrspacecast ptr addrspace(3) \2 to ptr\n\3 = addrspacecast ptr addrspace(3) \4 to ptr/g' "$TEMP_LL_FILE"
+sed -i 's/\(%[0-9]\+\) = addrspacecast ptr addrspace(3) \(%"[0-9]\+"\) to ptr/\1 = addrspacecast ptr addrspace(3) \2 to ptr addrspace(4)/g' "$TEMP_LL_FILE"
+
 # Reassemble and convert to SPIR-V
-llvm-as-18 /tmp/temp$STRIP_NAME.ll -o /tmp/temp$STRIP_NAME.bc
-llvm-spirv-18 /tmp/temp$STRIP_NAME.bc -o "$SPIRV_FILE"
+TEMP_BC_FILE="/tmp/temp$STRIP_NAME.bc"
+llvm-as-18 "$TEMP_LL_FILE" -o "$TEMP_BC_FILE"
+llvm-spirv-18 "$TEMP_BC_FILE" -o "$SPIRV_FILE"