WIP: adapt to sroa jll #521

wsmoses · 2025-01-13T00:29:00Z

which itself depends on XLA adapting to

llvm/llvm-project#122650
llvm/llvm-project#122646
llvm/llvm-project#122615
llvm/llvm-project#122574
llvm/llvm-project#122572

github-actions · 2025-01-13T00:30:10Z

src/Compiler.jl

+    passes = [
+            "inline{default-pipeline=canonicalize max-iterations=4}"
+    ]


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

passes = [

"inline{default-pipeline=canonicalize max-iterations=4}"

]

passes = ["inline{default-pipeline=canonicalize max-iterations=4}"]

github-actions · 2025-01-13T00:30:11Z

src/Compiler.jl

+        push!(passes,  "sroa-wrappers")
+        push!(passes,  "libdevice-funcs-raise")
+        push!(passes,  "canonicalize")


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

push!(passes, "sroa-wrappers")

push!(passes, "libdevice-funcs-raise")

push!(passes, "canonicalize")

push!(passes, "sroa-wrappers")

push!(passes, "libdevice-funcs-raise")

push!(passes, "canonicalize")

github-actions · 2025-01-13T00:30:11Z

src/Compiler.jl

+    return join(passes,
        ',',
    )


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

return join(passes,

',',

)

return join(passes, ',')

github-actions · 2025-01-15T05:12:01Z

src/Compiler.jl

@@ -379,12 +385,20 @@ function compile_mlir!(mod, f, args; optimize::Union{Bool,Symbol}=true, no_nan::
    if isdefined(Reactant_jll, :ptxas_path)
        toolkit = Reactant_jll.ptxas_path[1:(end - length("/bin/ptxas"))]
    end
-    kern = "lower-kernel{run_init=true toolkitPath=$toolkit cuLaunchKernelPtr=$(cuLaunch[]) cuModuleLoadDataPtr=$(cuModule[]) cuModuleGetFunctionPtr=$(cuFunc[])},symbol-dce"
+    if DEBUG_KERNEL[]
+        curesulthandler = XLA.Libdl.dlsym(Reactant_jll.libReactantExtra_handle, "ReactantHandleCuResult")


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

curesulthandler = XLA.Libdl.dlsym(Reactant_jll.libReactantExtra_handle, "ReactantHandleCuResult")

curesulthandler = XLA.Libdl.dlsym(

Reactant_jll.libReactantExtra_handle, "ReactantHandleCuResult"

)

github-actions · 2025-01-15T05:12:01Z

src/Tracing.jl

@@ -318,6 +318,18 @@ function Base.showerror(io::IO, err::NoFieldMatchError)
    )
 end

+function make_tracer(
+    seen,
+    @nospecialize(prev::Union{Base.ExceptionStack, Core.MethodInstance}),


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

@nospecialize(prev::Union{Base.ExceptionStack, Core.MethodInstance}),

@nospecialize(prev::Union{Base.ExceptionStack,Core.MethodInstance}),

github-actions · 2025-01-16T00:48:49Z

test/integration/python.jl

@@ -2,6 +2,9 @@ using Reactant
 using Reactant: Ops

 using Test
+
+# Jax on Github CI dislikes X86 macos
+@static if !Sys.isapple() || Sys.ARCH != :x86_64
 using PythonCall


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

using PythonCall

using PythonCall

github-actions · 2025-01-16T00:48:49Z

test/integration/python.jl

@@ -11,3 +14,4 @@ using PythonCall
    @test typeof(result) == ConcreteRNumber{Float32}
    @test result ≈ 6
 end
+end


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

end

github-actions · 2025-01-16T00:48:50Z

test/integration/python.jl

[JuliaFormatter] _{reported by reviewdog 🐶}

Reactant.jl/test/integration/python.jl

Lines 10 to 11 in f289522

@testset "PythonCall" begin

jax = pyimport("jax")

github-actions · 2025-01-16T00:48:50Z

test/integration/python.jl

[JuliaFormatter] _{reported by reviewdog 🐶}

Reactant.jl/test/integration/python.jl

Lines 13 to 15 in f289522

result = @jit jax.numpy.sum(Reactant.to_rarray(Float32[1, 2, 3]))

@test typeof(result) == ConcreteRNumber{Float32}

@test result ≈ 6

github-actions · 2025-01-16T00:51:21Z

ext/ReactantCUDAExt.jl

@@ -425,6 +428,7 @@ function get_field_offset(T::Type, path)
    offset = 0
    current_type = T

+


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

github-actions · 2025-01-16T00:51:21Z

ext/ReactantCUDAExt.jl


        # Update current_type to the field's type for next iteration
-        current_type = fieldtype(current_type, field_idx)
+        current_type = tcurrent_type
+


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

github-actions · 2025-01-16T00:51:21Z

ext/ReactantCUDAExt.jl

    end
+


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

github-actions · 2025-01-16T00:51:21Z

ext/ReactantCUDAExt.jl

@@ -461,6 +469,10 @@ Reactant.@reactant_overlay @noinline function (func::LLVMFunc{F,tt})(
    blockdim = CUDA.CuDim3(blocks)
    threaddim = CUDA.CuDim3(threads)

+    if convert == Val(true)
+        args = recudaconvert.(args) 


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

args = recudaconvert.(args)

args = recudaconvert.(args)

github-actions · 2025-01-16T00:51:21Z

ext/ReactantCUDAExt.jl

@@ -650,6 +662,7 @@ Reactant.@reactant_overlay @noinline function (func::LLVMFunc{F,tt})(
    end

    location = MLIR.IR.Location()
+    @assert length(restys) == length(aliases) 


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

@assert length(restys) == length(aliases)

@assert length(restys) == length(aliases)

github-actions bot reviewed Jan 13, 2025

View reviewed changes

wsmoses force-pushed the sroa branch from 2b7218c to ea05450 Compare January 13, 2025 18:18

github-actions bot reviewed Jan 15, 2025

View reviewed changes

wsmoses force-pushed the sroa branch from 6c98d9a to fe958ab Compare January 15, 2025 15:18

github-actions bot reviewed Jan 16, 2025

View reviewed changes

wsmoses added 13 commits January 15, 2025 18:50

WIP: adapt to sroa jll

fdcb111

fixup

4b2bd6b

fix

68afe86

fixup

843c462

fixup

4f3c68b

rmprint

149f24b

fix patch

cb86b3c

Update WORKSPACE

9c1381d

Update Project.toml

e68b0dd

adapt to upstream properly

060f245

cuconvert

46e8210

Update Project.toml

4755292

fix ci errs

63c6c25

wsmoses force-pushed the sroa branch from f289522 to 63c6c25 Compare January 16, 2025 00:50

github-actions bot reviewed Jan 16, 2025

View reviewed changes

wsmoses added 2 commits January 15, 2025 21:57

alias

522221e

cuda test

0aaebc5

wsmoses merged commit a1f93a0 into main Jan 16, 2025
2 of 10 checks passed

wsmoses deleted the sroa branch January 16, 2025 03:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: adapt to sroa jll #521

WIP: adapt to sroa jll #521

wsmoses commented Jan 13, 2025

github-actions bot Jan 13, 2025

github-actions bot Jan 13, 2025

github-actions bot Jan 13, 2025

github-actions bot Jan 15, 2025

github-actions bot Jan 15, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

github-actions bot Jan 16, 2025

	@nospecialize(prev::Union{Base.ExceptionStack, Core.MethodInstance}),
	@nospecialize(prev::Union{Base.ExceptionStack,Core.MethodInstance}),

	result = @jit jax.numpy.sum(Reactant.to_rarray(Float32[1, 2, 3]))
	@test typeof(result) == ConcreteRNumber{Float32}
	@test result ≈ 6

		@@ -425,6 +428,7 @@ function get_field_offset(T::Type, path)
		offset = 0
		current_type = T

	@assert length(restys) == length(aliases)
	@assert length(restys) == length(aliases)

WIP: adapt to sroa jll #521

WIP: adapt to sroa jll #521

Conversation

wsmoses commented Jan 13, 2025

github-actions bot Jan 13, 2025

Choose a reason for hiding this comment

github-actions bot Jan 13, 2025

Choose a reason for hiding this comment

github-actions bot Jan 13, 2025

Choose a reason for hiding this comment

github-actions bot Jan 15, 2025

Choose a reason for hiding this comment

github-actions bot Jan 15, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment

github-actions bot Jan 16, 2025

Choose a reason for hiding this comment