diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ed61b671..999475fed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,11 +32,11 @@ jobs: # - x64 # pocl: [jll,] include: - - version: '1.10' - os: ubuntu-latest - arch: x64 - pocl: local - allow_failure: true + # - version: '1.10' + # os: ubuntu-latest + # arch: x64 + # pocl: local + # allow_failure: true - version: '1.11' os: ubuntu-latest arch: x64 @@ -70,7 +70,8 @@ jobs: if: ${{ matrix.pocl == 'local' }} uses: actions/checkout@v4 with: - repository: pocl/pocl + repository: pjaaskel/pocl + ref: UnreachableToReturns-fixes path: pocl - name: Install system dependencies if: ${{ matrix.pocl == 'local' }} @@ -92,9 +93,8 @@ jobs: "CMake_jll", ]) # versioned - llvm_version = "$(Base.libllvm_version.major).$(Base.libllvm_version.minor)" - Pkg.add(name="LLVM_full_jll", version=llvm_version) - Pkg.add(name="SPIRV_LLVM_Translator_jll", version=llvm_version)' + Pkg.add(name="LLVM_full_jll", version="19") + Pkg.add(name="SPIRV_LLVM_Translator_jll", version="19")' - name: Build PoCL if: ${{ matrix.pocl == 'local' }} run: | @@ -119,6 +119,7 @@ jobs: -DCMAKE_C_FLAGS="-fdiagnostics-color=always" -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS:Bool=OFF + -DSTATIC_LLVM:Bool=On -DPOCL_DEBUG_MESSAGES:Bool=ON -DCMAKE_INSTALL_PREFIX=$destdir -DWITH_LLVM_CONFIG=$(LLVM_full_jll.artifact_dir)/tools/llvm-config diff --git a/Project.toml b/Project.toml index 3119fc9e6..4504dcc5f 100644 --- a/Project.toml +++ b/Project.toml @@ -48,3 +48,6 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[sources] +SPIRVIntrinsics = {url = "https://github.com/JuliaGPU/OpenCL.jl", rev = "master", subdir = "lib/intrinsics"} \ No newline at end of file diff --git a/src/pocl/device/runtime.jl b/src/pocl/device/runtime.jl index 2d11f701f..f980f683b 100644 --- a/src/pocl/device/runtime.jl +++ b/src/pocl/device/runtime.jl @@ -10,23 +10,23 @@ report_oom(sz) = return import SPIRVIntrinsics: get_global_id function report_exception(ex) - # SPIRVIntrinsics.@printf( - # "ERROR: a %s was thrown during kernel execution on thread (%d, %d, %d).\n", - # ex, get_global_id(UInt32(0)), get_global_id(UInt32(1)), get_global_id(UInt32(2)) - # ) + SPIRVIntrinsics.@printf( + "ERROR: a %s was thrown during kernel execution on thread (%d, %d, %d).\n", + ex, get_global_id(UInt32(0)), get_global_id(UInt32(1)), get_global_id(UInt32(2)) + ) return end function report_exception_name(ex) - # SPIRVIntrinsics.@printf( - # "ERROR: a %s was thrown during kernel execution on thread (%d, %d, %d).\n", - # ex, get_global_id(UInt32(0)), get_global_id(UInt32(1)), get_global_id(UInt32(2)) - # ) - # SPIRVIntrinsics.@printf("Stacktrace:\n") + SPIRVIntrinsics.@printf( + "ERROR: a %s was thrown during kernel execution on thread (%d, %d, %d).\n", + ex, get_global_id(UInt32(0)), get_global_id(UInt32(1)), get_global_id(UInt32(2)) + ) + SPIRVIntrinsics.@printf("Stacktrace:\n") return end function report_exception_frame(idx, func, file, line) - # SPIRVIntrinsics.@printf(" [%d] %s at %s:%d\n", idx, func, file, line) + SPIRVIntrinsics.@printf(" [%d] %s at %s:%d\n", idx, func, file, line) return end