Commit d9996c66 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Get clang jit working for x86.

parent 4cedafe1

CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -226,7 +226,9 @@ add_dependencies (CheckerOptionHandlingAnalyzerPlugin_exports pull_llvm) 
add_dependencies (clangAnalysisFlowSensitiveResources pull_llvm)

add_dependencies (ppc-resource-headers pull_llvm)

add_dependencies (hmaptool pull_llvm)

if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

    add_dependencies (libclang_exports pull_llvm)

endif ()

add_dependencies (hip-resource-headers pull_llvm)

add_dependencies (scan-view pull_llvm)

add_dependencies (scan-build pull_llvm)
@@ -248,6 +250,8 @@ target_include_directories (llvm_dep 
string(REGEX MATCH "^[^-]*" LLVM_NATIVE_ARCH ${LLVM_HOST_TRIPLE})

if (LLVM_NATIVE_ARCH MATCHES "arm64")

    set (LLVM_NATIVE_ARCH AArch64)

elseif (LLVM_NATIVE_ARCH MATCHES "x86_64")

    set (LLVM_NATIVE_ARCH X86)

else ()

   message (FATAL_ERROR "Unknown native arch ${LLVM_NATIVE_ARCH}")

endif ()

graph_framework/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ execute_process (COMMAND ${Python_EXECUTABLE} get_includes.py --compiler=${CMAKE 
target_compile_definitions (rays

                            INTERFACE

                            $<$<PLATFORM_ID:Darwin>:CXX_ARGS="-I${CMAKE_CURRENT_SOURCE_DIR}${jit_include_paths} -fgnuc-version=4.2.1 -std=gnu++2a">

                            $<$<PLATFORM_ID:Linux>:CXX_ARGS="-I${CMAKE_CURRENT_SOURCE_DIR}${jit_include_paths} -std=gnu++2a -fPIC -fno-use-cxa-atexit">

                            $<$<PLATFORM_ID:Linux>:CXX_ARGS="-I${CMAKE_CURRENT_SOURCE_DIR}${jit_include_paths} -std=gnu++2a -fno-use-cxa-atexit">

                            EFIT_FILE="${CMAKE_CURRENT_SOURCE_DIR}/../graph_tests/efit.nc"

                            VMEC_FILE="${CMAKE_CURRENT_SOURCE_DIR}/../graph_tests/vmec.nc"

                            $<$<BOOL:${USE_CUDA}>:HEADER_DIR="$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>">

graph_framework/cpu_context.hpp

+1 −3
Original line number Diff line number Diff line
@@ -129,9 +129,7 @@ namespace gpu { 
            char arg_string[] = CXX_ARGS;

            std::vector<const char *> args = split_string(arg_string);

            args.push_back(filename.c_str());

#ifndef NDEBUG

            args.push_back("-g");

#else

#ifdef NDEBUG

            args.push_back("-O3");

#endif

            if (jit::verbose) {