Merge branch 'llvm' into 'main' (9cdb168f) · Commits · Cianciosa, Mark / graph_framework

CMakeLists.txt

+49 −3

Original line number	Diff line number	Diff line
		@@ -175,8 +175,8 @@ register_project (llvm
		${URL_PROTO}github.com${URL_SEP}llvm/llvm-project.git
		main
		llvm
		LLVM_BUILD_LLVM_DYLIB ON BOOL
		LLVM_TARGETS_TO_BUILD Native STRING
		LLVM_ENABLE_PROJECTS clang STRING
		)

		#-------------------------------------------------------------------------------
		@@ -205,16 +205,62 @@ add_dependencies (llvm_vcsrevision_h pull_llvm)
		add_dependencies (benchmark pull_llvm)
		add_dependencies (benchmark_main pull_llvm)
		add_dependencies (obj.LLVMTableGenBasic pull_llvm)
		add_dependencies (core-resource-headers pull_llvm)
		add_dependencies (mips-resource-headers pull_llvm)
		add_dependencies (utility-resource-headers pull_llvm)
		add_dependencies (ppc-htm-resource-headers pull_llvm)
		add_dependencies (loongarch-resource-headers pull_llvm)
		add_dependencies (systemz-resource-headers pull_llvm)
		add_dependencies (hexagon-resource-headers pull_llvm)
		add_dependencies (webassembly-resource-headers pull_llvm)
		add_dependencies (riscv-resource-headers pull_llvm)
		add_dependencies (hlsl-resource-headers pull_llvm)
		add_dependencies (ve-resource-headers pull_llvm)
		add_dependencies (opencl-resource-headers pull_llvm)
		add_dependencies (llvm-libc-resource-headers pull_llvm)
		add_dependencies (openmp-resource-headers pull_llvm)
		add_dependencies (windows-resource-headers pull_llvm)
		add_dependencies (SampleAnalyzerPlugin_exports pull_llvm)
		add_dependencies (CheckerDependencyHandlingAnalyzerPlugin_exports pull_llvm)
		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)
		add_dependencies (cuda-resource-headers pull_llvm)
		add_dependencies (scan-build-py pull_llvm)
		add_dependencies (x86-resource-headers pull_llvm)
		add_dependencies (obj.clangSupport pull_llvm)

		add_library (llvm_dep INTERFACE)
		target_include_directories (llvm_dep
		INTERFACE
		$<BUILD_INTERFACE:${llvm_source_dir}/llvm/include>
		$<BUILD_INTERFACE:${llvm_source_dir}/clang/include>
		$<BUILD_INTERFACE:${llvm_binary_dir}/include>
		$<BUILD_INTERFACE:${llvm_binary_dir}/tools/clang/include>
		)

		# Need to manually figure out the native arch.
		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 ()

		target_link_libraries (llvm_dep
		INTERFACE
		LLVM
		clangCodeGen
		LLVM${LLVM_NATIVE_ARCH}CodeGen
		LLVMOrcJIT
		)

		#-------------------------------------------------------------------------------

graph_framework.xcodeproj/project.pbxproj

+52 −23

Original line number	Diff line number	Diff line
		@@ -296,6 +296,7 @@
		C73BBE7D29F816E60027BB7F /* piecewise_test.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; path = piecewise_test.cpp; sourceTree = "<group>"; };
		C73BBE9629F8669F0027BB7F /* newton.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = newton.hpp; sourceTree = "<group>"; };
		C74DF4572AA8BC7300319113 /* graph_benchmark */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = graph_benchmark; sourceTree = BUILT_PRODUCTS_DIR; };
		C760B1AB2BC6D760001737A3 /* get_includes.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = get_includes.py; sourceTree = "<group>"; };
		C7678FBD2B45C2850025F37E /* bin.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = bin.py; sourceTree = "<group>"; };
		C77E6DF522DD64E700469621 /* trigonometry.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = trigonometry.hpp; sourceTree = "<group>"; };
		C79141A622DA9BF200E0BA0D /* libgraph_framework.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgraph_framework.a; sourceTree = BUILT_PRODUCTS_DIR; };
		@@ -461,6 +462,7 @@
		children = (
		C7167B222AC5CE8500E03131 /* fix_NaN.py */,
		C7678FBD2B45C2850025F37E /* bin.py */,
		C760B1AB2BC6D760001737A3 /* get_includes.py */,
		);
		path = utilities;
		sourceTree = "<group>";
		@@ -884,7 +886,7 @@
		isa = PBXProject;
		attributes = {
		BuildIndependentTargetsInParallel = YES;
		LastUpgradeCheck = 1520;
		LastUpgradeCheck = 1530;
		ORGANIZATIONNAME = "Cianciosa, Mark R.";
		TargetAttributes = {
		C73690302A38C498001733B0 = {
		@@ -1337,7 +1339,7 @@
		"VMEC_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/vmec.nc\\\"",
		USE_METAL,
		"CXX_FLAGS=\\\"-g\\\"",
		"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\\"",
		"\"CXX_ARGS=\\\"-I/Users/m4c/Projects/graph_framework/graph_framework -std=gnu++2a\\\"\"",
		STATIC,
		"DEBUG=1",
		"$(inherited)",
		@@ -1348,10 +1350,13 @@
		GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
		GCC_WARN_UNUSED_FUNCTION = YES;
		GCC_WARN_UNUSED_VARIABLE = YES;
		HEADER_SEARCH_PATHS = /usr/local/include;
		HEADER_SEARCH_PATHS = (
		/usr/local/include,
		LLVM/llvm/include,
		);
		LIBRARY_SEARCH_PATHS = (
		/usr/local/lib,
		"build/_deps/llvm-build/lib",
		/usr/local/lib,
		);
		MACOSX_DEPLOYMENT_TARGET = 14.0;
		MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
		@@ -1364,11 +1369,28 @@
		"-rpath",
		/usr/local/lib,
		"-lLLVM",
		"-lclangFrontend",
		"-lclangBasic",
		"-lclangEdit",
		"-lclangLex",
		"-lclangDriver",
		"-lclangSerialization",
		"-lclangAST",
		"-lclangSema",
		"-lclangAnalysis",
		"-lclangASTMatchers",
		"-lclangSupport",
		"-lclangParse",
		"-lclangAPINotes",
		"-lclangCodeGen",
		);
		SDKROOT = macosx;
		SYSTEM_HEADER_SEARCH_PATHS = "";
		USER_HEADER_SEARCH_PATHS = (
		LLVM/llvm/include,
		"build/_deps/llvm-build/include",
		LLVM/clang/include,
		"build/_deps/llvm-build/tools/clang/include",
		);
		};
		name = Debug;
		@@ -1419,7 +1441,7 @@
		"EFIT_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/efit.nc\\\"",
		"VMEC_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/vmec.nc\\\"",
		USE_METAL,
		"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\\"",
		"\"CXX_ARGS=\\\"-I/Users/m4c/Projects/graph_framework/graph_framework -std=gnu++2a\\\"\"",
		"$(inherited)",
		);
		GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
		@@ -1428,10 +1450,13 @@
		GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
		GCC_WARN_UNUSED_FUNCTION = YES;
		GCC_WARN_UNUSED_VARIABLE = YES;
		HEADER_SEARCH_PATHS = /usr/local/include;
		HEADER_SEARCH_PATHS = (
		/usr/local/include,
		LLVM/llvm/include,
		);
		LIBRARY_SEARCH_PATHS = (
		/usr/local/lib,
		"build/_deps/llvm-build/lib",
		/usr/local/lib,
		);
		MACOSX_DEPLOYMENT_TARGET = 14.0;
		MTL_ENABLE_DEBUG_INFO = NO;
		@@ -1444,11 +1469,28 @@
		"-rpath",
		/usr/local/lib,
		"-lLLVM",
		"-lclangFrontend",
		"-lclangBasic",
		"-lclangEdit",
		"-lclangLex",
		"-lclangDriver",
		"-lclangSerialization",
		"-lclangAST",
		"-lclangSema",
		"-lclangAnalysis",
		"-lclangASTMatchers",
		"-lclangSupport",
		"-lclangParse",
		"-lclangAPINotes",
		"-lclangCodeGen",
		);
		SDKROOT = macosx;
		SYSTEM_HEADER_SEARCH_PATHS = "";
		USER_HEADER_SEARCH_PATHS = (
		LLVM/llvm/include,
		"build/_deps/llvm-build/include",
		LLVM/clang/include,
		"build/_deps/llvm-build/tools/clang/include",
		);
		};
		name = Release;
		@@ -1460,14 +1502,7 @@
		DEAD_CODE_STRIPPING = YES;
		DEVELOPMENT_TEAM = 2M4J3Y9U5K;
		EXECUTABLE_PREFIX = lib;
		GCC_PREPROCESSOR_DEFINITIONS = (
		USE_METAL,
		"CXX_FLAGS=\\\"-gl\\\"",
		"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\\"",
		STATIC,
		"DEBUG=1",
		"$(inherited)",
		);
		GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
		MACOSX_DEPLOYMENT_TARGET = 13.5;
		OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
		OTHER_LDFLAGS = "";
		@@ -1484,10 +1519,7 @@
		DEAD_CODE_STRIPPING = YES;
		DEVELOPMENT_TEAM = 2M4J3Y9U5K;
		EXECUTABLE_PREFIX = lib;
		GCC_PREPROCESSOR_DEFINITIONS = (
		USE_METAL,
		"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\ -g\" $(inherited)",
		);
		GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
		MACOSX_DEPLOYMENT_TARGET = 13.5;
		OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
		OTHER_LDFLAGS = "";
		@@ -1521,10 +1553,7 @@
		CODE_SIGN_STYLE = Automatic;
		DEAD_CODE_STRIPPING = YES;
		DEVELOPMENT_TEAM = "";
		GCC_PREPROCESSOR_DEFINITIONS = (
		"CXX_FLAGS=\\\"-g\\\"",
		"$(inherited)",
		);
		GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
		MACOSX_DEPLOYMENT_TARGET = 13.5;
		OTHER_CPLUSPLUSFLAGS = "";
		OTHER_LDFLAGS = (

graph_framework.xcodeproj/xcshareddata/xcschemes/arithmetic_test.xcscheme

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<Scheme
		LastUpgradeVersion = "1520"
		LastUpgradeVersion = "1530"
		version = "1.7">
		<BuildAction
		parallelizeBuildables = "YES"

graph_framework.xcodeproj/xcshareddata/xcschemes/graph_driver.xcscheme

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<Scheme
		LastUpgradeVersion = "1520"
		LastUpgradeVersion = "1530"
		version = "1.3">
		<BuildAction
		parallelizeBuildables = "YES"

graph_framework.xcodeproj/xcshareddata/xcschemes/jit_test.xcscheme

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<Scheme
		LastUpgradeVersion = "1520"
		LastUpgradeVersion = "1530"
		version = "1.3">
		<BuildAction
		parallelizeBuildables = "YES"