Include JIT target cpu and target triple in versioninfo

Author: christiangnrd

src/codegen-stubs.c

@@ -156,6 +156,8 @@ JL_DLLEXPORT void* JLJITMangleAndIntern_fallback(void* JIT, const char *Name) UN
 
 JL_DLLEXPORT const char *JLJITGetTripleString_fallback(void* JIT) UNAVAILABLE
 
+JL_DLLEXPORT const char *JLJITGetCPUString_fallback(void* JIT) UNAVAILABLE
+
 JL_DLLEXPORT const char JLJITGetGlobalPrefix_fallback(void* JIT) UNAVAILABLE
 
 JL_DLLEXPORT const char *JLJITGetDataLayoutString_fallback(void* JIT) UNAVAILABLE

src/jl_exported_funcs.inc

@@ -560,6 +560,7 @@
     YY(JLJITLookup) \
     YY(JLJITMangleAndIntern) \
     YY(JLJITGetTripleString) \
+    YY(JLJITGetCPUString) \
     YY(JLJITGetGlobalPrefix) \
     YY(JLJITGetDataLayoutString) \
     YY(JLJITGetIRCompileLayer) \

src/llvm_api.cpp

@@ -123,6 +123,13 @@ JLJITGetTripleString_impl(JuliaOJITRef JIT)
     return unwrap(JIT)->getTargetTriple().str().c_str();
 }
 
+JL_DLLEXPORT_CODEGEN const char *
+JLJITGetCPUString_impl(JuliaOJITRef JIT)
+{
+    static std::string target_cpu = unwrap(JIT)->getTargetCPU().str();
+    return target_cpu.c_str();
+}
+
 JL_DLLEXPORT_CODEGEN char
 JLJITGetGlobalPrefix_impl(JuliaOJITRef JIT)
 {

stdlib/InteractiveUtils/src/InteractiveUtils.jl

@@ -127,9 +127,15 @@ function versioninfo(io::IO=stdout; verbose::Bool=false)
             """
         )
     end
+
+    jit_cpu, jit_triple = let _jit = ccall(:JLJITGetJuliaOJIT, Ptr{Cvoid}, ())
+        _cpu = unsafe_string(ccall(:JLJITGetCPUString, Cstring, (Ptr{Cvoid},), _jit))
+        _triple = unsafe_string(ccall(:JLJITGetTripleString, Cstring, (Ptr{Cvoid},), _jit))
+        _cpu, _triple
+    end
     println(io, "Platform Info:")
     println(io, "  OS: ", Sys.iswindows() ? "Windows" : Sys.isapple() ?
-        "macOS" : Sys.KERNEL, " (", Sys.MACHINE, ")")
+        "macOS" : Sys.KERNEL, " (", jit_triple, ")")
 
     if verbose
         lsb = ""
@@ -172,7 +178,7 @@ function versioninfo(io::IO=stdout; verbose::Bool=false)
         println(io)
         println(io, "  WORD_SIZE: ", Sys.WORD_SIZE)
     end
-    println(io, "  LLVM: libLLVM-", Base.libllvm_version, " (", Sys.JIT, ")")
+    println(io, "  LLVM: libLLVM-", Base.libllvm_version, " (", Sys.JIT, ", ", jit_cpu, ")")
     println(io, """Threads: $(Threads.nthreads(:default)) default, $(Threads.nthreads(:interactive)) interactive, \
       $(Threads.ngcthreads()) GC (on $(Sys.CPU_THREADS) virtual cores)""")
 

test/llvmcall2.jl

@@ -68,10 +68,17 @@ end
     function JLJITGetTripleString(JIT)
         ccall(:JLJITGetTripleString, Cstring, (Ptr{Cvoid},), JIT)
     end
+    function JLJITGetCPUString(JIT)
+        ccall(:JLJITGetCPUString, Cstring, (Ptr{Cvoid},), JIT)
+    end
     jit = JLJITGetJuliaOJIT()
-    str = JLJITGetTripleString(jit)
-    jl_str = unsafe_string(str)
-    @test length(jl_str) > 4
+    triple_str = JLJITGetTripleString(jit)
+    jl_triple_str = unsafe_string(triple_str)
+    @test length(jl_triple_str) > 4
+
+    cpu_str = JLJITGetCPUString(jit)
+    jl_cpu_str = unsafe_string(cpu_str)
+    @test length(jl_cpu_str) > 4
 end