Merge pull request #174 from maleadt/tb/update

Use Base.julia_cmd, add address space removal pass

Author: maleadt

lib/libLLVM_extra.jl

@@ -87,25 +87,19 @@ function LLVMAddTargetLibraryInfoByTriple(Triple, PM::LLVMPassManagerRef)
 end
 
 if VERSION < v"1.2.0-DEV.531"
-
 function LLVMAddNVVMReflectPass(PM::LLVMPassManagerRef, smversion)
     @apicall(:LLVMExtraAddMVVMReflectPass,Cvoid,(LLVMPassManagerRef,), PM)
 end
-
 else
 
 if libllvm_version < v"8.0"
-
-function LLVMAddNVVMReflectPass(PM::LLVMPassManagerRef, smversion)
-    @apicall(:LLVMExtraAddNVVMReflectPass,Cvoid,(LLVMPassManagerRef,), PM)
-end
-
+    function LLVMAddNVVMReflectPass(PM::LLVMPassManagerRef, smversion)
+        @apicall(:LLVMExtraAddNVVMReflectPass,Cvoid,(LLVMPassManagerRef,), PM)
+    end
 else
-
-function LLVMAddNVVMReflectPass(PM::LLVMPassManagerRef, smversion)
-    @apicall(:LLVMExtraAddNVVMReflectFunctionPass,Cvoid,(LLVMPassManagerRef, Cuint), PM, smversion)
-end
-
+    function LLVMAddNVVMReflectPass(PM::LLVMPassManagerRef, smversion)
+        @apicall(:LLVMExtraAddNVVMReflectFunctionPass,Cvoid,(LLVMPassManagerRef, Cuint), PM, smversion)
+    end
 end
 
 function LLVMAddAllocOptPass(PM::LLVMPassManagerRef)
@@ -151,23 +145,25 @@ end
 end
 
 if VERSION >= v"1.3.0-DEV.95"
-
 function LLVMAddFinalLowerGCPass(PM::LLVMPassManagerRef)
     @apicall(:LLVMExtraAddFinalLowerGCPass,Cvoid,(LLVMPassManagerRef,), PM)
 end
+end
 
-end # v"1.3.0-DEV.95"
+if VERSION >= v"1.5.0-DEV.802"
+function LLVMAddRemoveJuliaAddrspacesPass(PM::LLVMPassManagerRef)
+    @apicall(:LLVMExtraAddRemoveJuliaAddrspacesPass,Cvoid,(LLVMPassManagerRef,), PM)
+end
+end
 
 function LLVMGetValueContext(V::LLVMValueRef)
     @apicall(:LLVMExtraGetValueContext,LLVMContextRef,(LLVMValueRef,),V)
 end
 
 if VERSION >= v"0.7.0-alpha.37"
-
 function LLVMGetSourceLocation(V::LLVMValueRef, index, Name, Filename, Line, Column)
     @apicall(:LLVMExtraGetSourceLocation,Cint,(LLVMValueRef,Cint,Ptr{Cstring},Ptr{Cstring},Ptr{Cuint},Ptr{Cuint}), V, index, Name, Filename, Line, Column)
 end
-
 end
 
 if libllvm_version >= v"8.0"

src/interop/passes.jl

@@ -1,6 +1,6 @@
 export alloc_opt!, barrier_noop!, gc_invariant_verifier!, lower_exc_handlers!,
        combine_mul_add!, multi_versioning!, propagate_julia_addrsp!, lower_ptls!,
-       lower_simdloop!, late_lower_gc_frame!, final_lower_gc!
+       lower_simdloop!, late_lower_gc_frame!, final_lower_gc!, remove_julia_addrspaces!
 
 alloc_opt!(pm::PassManager) =
     API.LLVMAddAllocOptPass(ref(pm))
@@ -38,3 +38,9 @@ if VERSION >= v"1.3.0-DEV.95"
 else
     final_lower_gc!(pm::PassManager) = nothing
 end
+
+if VERSION >= v"1.5.0-DEV.802"
+    remove_julia_addrspaces!(pm::PassManager) = API.LLVMAddRemoveJuliaAddrspacesPass(LLVM.ref(pm))
+else
+    remove_julia_addrspaces!(pm::PassManager) = nothing
+end

test/examples.jl

@@ -19,8 +19,12 @@ filter!(file -> !occursin("Kaleidoscope", file), examples)
 cd(examples_dir) do
     examples = relpath.(examples, Ref(examples_dir))
     @testset for example in examples
-        cmd = julia_cmd(`$example`)
-        @test success(pipeline(cmd, stderr=stderr))
+        cmd = Base.julia_cmd()
+        if Base.JLOptions().project != C_NULL
+            cmd = `$cmd --project=$(unsafe_string(Base.JLOptions().project))`
+        end
+
+        @test success(pipeline(`$cmd $example`, stderr=stderr))
     end
 end
 

test/support.jl

@@ -8,7 +8,11 @@ code = """
 """
 
 out = Pipe()
-run(pipeline(julia_cmd(`-e $code`), stdout=out, stderr=out))
+cmd = Base.julia_cmd()
+if Base.JLOptions().project != C_NULL
+    cmd = `$cmd --project=$(unsafe_string(Base.JLOptions().project))`
+end
+run(pipeline(`$cmd -e $code`, stdout=out, stderr=out))
 close(out.in)
 
 @test occursin("LLVM (http://llvm.org/)", read(out, String))

test/util.jl

@@ -1,15 +1,3 @@
-function julia_cmd(cmd)
-    return `
-        $(Base.julia_cmd())
-        --color=$(Base.have_color ? "yes" : "no")
-        --compiled-modules=$(Base.JLOptions().use_compiled_modules != 0 ? "yes" : "no")
-        --history-file=no
-        --startup-file=$(Base.JLOptions().startupfile != 2 ? "yes" : "no")
-        --code-coverage=$(["none", "user", "all"][1+Base.JLOptions().code_coverage])
-        $cmd
-    `
-end
-
 macro check_ir(inst, str)
     quote
         @test occursin($(esc(str)), string($(esc(inst))))