Commit 64cb6892 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Merge branch 'constant_cache' into 'main' 

Add option to control inlining constants. This reduces the length of the...

See merge request !45
parents 04d2017e a1e0909b

CMakeLists.txt

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ project (rays CXX) 
#-------------------------------------------------------------------------------

option (USE_PCH "Enable the use of precompiled headers" ON)

option (SAVE_KERNEL_SOURCE "Writes the kernel source code to a file." OFF)

option (USE_INPUT_CACHE "Cache the values kernel input values." OFF)

option (USE_CONSTANT_CACHE "Cache the value of constantants in kernel registers." OFF)

option (SHOW_USE_COUNT "Add a comment showing the use count in kernel sources." OFF)



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

#  Set the cmake module path.
@@ -76,8 +79,6 @@ else () 
    endif ()

endif ()



option (USE_INPUT_CACHE "Cache the values kernel input values." OFF)



add_library (gpu_lib INTERFACE)

target_link_libraries (gpu_lib

                       INTERFACE

graph_framework.xcodeproj/project.pbxproj

+180 −1
Original line number Diff line number Diff line
@@ -1600,6 +1600,7 @@ 
					"-lLLVMAnalysis",

					"-lLLVMScalarOpts",

					"-lLLVMCodeGenTypes",

					"-lLLVMCodeGenData",

					"-lLLVMCodeGen",

					"-lLLVMTargetParser",

					"-lLLVMScalarOpts",
@@ -1762,6 +1763,7 @@ 
					"-lLLVMAnalysis",

					"-lLLVMScalarOpts",

					"-lLLVMCodeGenTypes",

					"-lLLVMCodeGenData",

					"-lLLVMCodeGen",

					"-lLLVMTargetParser",

					"-lLLVMScalarOpts",
@@ -2054,6 +2056,7 @@ 
				GCC_PREPROCESSOR_DEFINITIONS = (

					"EFIT_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/efit.nc\\\"",

					USE_METAL,

					"\"CXX_ARGS=\\\"-I/Users/m4c/Projects/graph_framework/graph_framework -I/usr/local/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/16/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks -fgnuc-version=4.2.1 -std=gnu++2a\\\"\"",

					"DEBUG=1",

					"$(inherited)",

				);
@@ -2072,7 +2075,6 @@ 
					"-lLLVMTextAPI",

					"-lLLVMRuntimeDyld",

					"-lLLVMOrcShared",

					"-lLLVMOrcTargetProcess",

					"-lLLVMOrcDebugging",

					"-lLLVMOrcTargetProcess",

					"-lLLVMOrcJIT",
@@ -2125,6 +2127,9 @@ 
					"-lLLVMAArch64Desc",

					"-lLLVMAArch64AsmParser",

					"-lLLVMAArch64CodeGen",

					"-lLLVMSandboxIR",

					"-lLLVMCodeGenData",

					"-lLLVMCGData",

					"-lclangFrontend",

					"-lclangBasic",

					"-lclangEdit",
@@ -2155,6 +2160,7 @@ 
				DEAD_CODE_STRIPPING = YES;

				GCC_PREPROCESSOR_DEFINITIONS = (

					"EFIT_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/efit.nc\\\"",

					"\"CXX_ARGS=\\\"-I/Users/m4c/Projects/graph_framework/graph_framework -I/usr/local/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/16/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks -fgnuc-version=4.2.1 -std=gnu++2a\\\"\"",

					USE_METAL,

					"$(inherited)",

				);
@@ -2226,6 +2232,7 @@ 
					"-lLLVMAArch64Desc",

					"-lLLVMAArch64AsmParser",

					"-lLLVMAArch64CodeGen",

					"-lLLVMSandboxIR",

					"-lclangFrontend",

					"-lclangBasic",

					"-lclangEdit",
@@ -2256,6 +2263,92 @@ 
				CODE_SIGN_STYLE = Automatic;

				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = 13.3;

				OTHER_LDFLAGS = (

					"-lnetcdf",

					"-ld_classic",

					"-L/Users/m4c/Projects/graph_framework/build/_deps/llvm-build/lib",

					"-lz",

					"-lLLVMCoverage",

					"-lLLVMSupport",

					"-lLLVMDebugInfoCodeView",

					"-lLLVMRemarks",

					"-lLLVMJITLink",

					"-lLLVMLinker",

					"-lLLVMTextAPI",

					"-lLLVMRuntimeDyld",

					"-lLLVMOrcShared",

					"-lLLVMOrcDebugging",

					"-lLLVMOrcTargetProcess",

					"-lLLVMOrcJIT",

					"-lLLVMHipStdPar",

					"-lLLVMAggressiveInstCombine",

					"-lLLVMVectorize",

					"-lLLVMAsmParser",

					"-lLLVMOption",

					"-lLLVMLTO",

					"-lLLVMObject",

					"-lLLVMWindowsDriver",

					"-lLLVMDemangle",

					"-lLLVMIRReader",

					"-lLLVMIRPrinter",

					"-lLLVMInstCombine",

					"-lLLVMBinaryFormat",

					"-lLLVMCoroutines",

					"-lLLVMBitstreamReader",

					"-lLLVMBitReader",

					"-lLLVMBitWriter",

					"-lLLVMDebugInfoDWARF",

					"-lLLVMInstrumentation",

					"-lLLVMCFGuard",

					"-lLLVMObjCARCOpts",

					"-lLLVMipo",

					"-lLLVMGlobalISel",

					"-lLLVMExecutionEngine",

					"-lLLVMFrontendDriver",

					"-lLLVMFrontendHLSL",

					"-lLLVMFrontendOpenMP",

					"-lLLVMFrontendOffloading",

					"-lLLVMSelectionDAG",

					"-lLLVMProfileData",

					"-lLLVMAnalysis",

					"-lLLVMScalarOpts",

					"-lLLVMCodeGenTypes",

					"-lLLVMCGData",

					"-lLLVMCodeGenData",

					"-lLLVMCodeGen",

					"-lLLVMTargetParser",

					"-lLLVMScalarOpts",

					"-lLLVMTarget",

					"-lLLVMTransformUtils",

					"-lLLVMPasses",

					"-lLLVMSupport",

					"-lLLVMMCParser",

					"-lLLVMMC",

					"-lLLVMCore",

					"-lLLVMSandboxIR",

					"-lLLVMAsmPrinter",

					"-lLLVMAArch64Utils",

					"-lLLVMAArch64Info",

					"-lLLVMAArch64Desc",

					"-lLLVMAArch64AsmParser",

					"-lLLVMAArch64CodeGen",

					"-lclangFrontend",

					"-lclangBasic",

					"-lclangEdit",

					"-lclangLex",

					"-lclangDriver",

					"-lclangSerialization",

					"-lclangAST",

					"-lclangSema",

					"-lclangAnalysis",

					"-lclangASTMatchers",

					"-lclangSupport",

					"-lclangParse",

					"-lclangAPINotes",

					"-lclangCodeGen",

					"-rpath",

					/usr/local/lib,

				);

				PRODUCT_NAME = "$(TARGET_NAME)";

			};

			name = Debug;
@@ -2268,6 +2361,92 @@ 
				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";

				CODE_SIGN_STYLE = Automatic;

				MACOSX_DEPLOYMENT_TARGET = 13.3;

				OTHER_LDFLAGS = (

					"-lnetcdf",

					"-ld_classic",

					"-L/Users/m4c/Projects/graph_framework/build/_deps/llvm-build/lib",

					"-lz",

					"-lLLVMCoverage",

					"-lLLVMSupport",

					"-lLLVMDebugInfoCodeView",

					"-lLLVMRemarks",

					"-lLLVMJITLink",

					"-lLLVMLinker",

					"-lLLVMTextAPI",

					"-lLLVMRuntimeDyld",

					"-lLLVMOrcShared",

					"-lLLVMOrcDebugging",

					"-lLLVMOrcTargetProcess",

					"-lLLVMOrcJIT",

					"-lLLVMHipStdPar",

					"-lLLVMAggressiveInstCombine",

					"-lLLVMVectorize",

					"-lLLVMAsmParser",

					"-lLLVMOption",

					"-lLLVMLTO",

					"-lLLVMObject",

					"-lLLVMWindowsDriver",

					"-lLLVMDemangle",

					"-lLLVMIRReader",

					"-lLLVMIRPrinter",

					"-lLLVMInstCombine",

					"-lLLVMBinaryFormat",

					"-lLLVMCoroutines",

					"-lLLVMBitstreamReader",

					"-lLLVMBitReader",

					"-lLLVMBitWriter",

					"-lLLVMDebugInfoDWARF",

					"-lLLVMInstrumentation",

					"-lLLVMCFGuard",

					"-lLLVMObjCARCOpts",

					"-lLLVMipo",

					"-lLLVMGlobalISel",

					"-lLLVMExecutionEngine",

					"-lLLVMFrontendDriver",

					"-lLLVMFrontendHLSL",

					"-lLLVMFrontendOpenMP",

					"-lLLVMFrontendOffloading",

					"-lLLVMSelectionDAG",

					"-lLLVMProfileData",

					"-lLLVMAnalysis",

					"-lLLVMScalarOpts",

					"-lLLVMCodeGenTypes",

					"-lLLVMCGData",

					"-lLLVMCodeGenData",

					"-lLLVMCodeGen",

					"-lLLVMTargetParser",

					"-lLLVMScalarOpts",

					"-lLLVMTarget",

					"-lLLVMTransformUtils",

					"-lLLVMPasses",

					"-lLLVMSupport",

					"-lLLVMMCParser",

					"-lLLVMMC",

					"-lLLVMCore",

					"-lLLVMSandboxIR",

					"-lLLVMAsmPrinter",

					"-lLLVMAArch64Utils",

					"-lLLVMAArch64Info",

					"-lLLVMAArch64Desc",

					"-lLLVMAArch64AsmParser",

					"-lLLVMAArch64CodeGen",

					"-lclangFrontend",

					"-lclangBasic",

					"-lclangEdit",

					"-lclangLex",

					"-lclangDriver",

					"-lclangSerialization",

					"-lclangAST",

					"-lclangSema",

					"-lclangAnalysis",

					"-lclangASTMatchers",

					"-lclangSupport",

					"-lclangParse",

					"-lclangAPINotes",

					"-lclangCodeGen",

					"-rpath",

					/usr/local/lib,

				);

				PRODUCT_NAME = "$(TARGET_NAME)";

			};

			name = Release;

graph_framework/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ target_compile_definitions (rays 
                            VMEC_FILE="${CMAKE_CURRENT_SOURCE_DIR}/../graph_tests/vmec.nc"

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

                            $<$<BOOL:${SAVE_KERNEL_SOURCE}>:SAVE_KERNEL_SOURCE>

                            $<$<BOOL:${USE_CONSTANT_CACHE}>:USE_CONSTANT_CACHE>

                            $<$<BOOL:${SHOW_USE_COUNT}>:SHOW_USE_COUNT>

)



target_include_directories (rays

graph_framework/arithmetic.hpp

+810 −150

File changed.

Preview size limit exceeded, changes collapsed.

graph_framework/backend.hpp

+15 −0
Original line number Diff line number Diff line
@@ -177,6 +177,21 @@ namespace backend { 
            return true;

        }



//------------------------------------------------------------------------------

///  @brief Is every element even.

///

///  @returns Returns true if every element is negative.

//------------------------------------------------------------------------------

        bool is_even() const {

            for (const T &d : memory) {

                if (std::fmod(std::real(d), std::real(static_cast<T> (2.0)))) {

                    return false;

                }

            }



            return true;

        }



//------------------------------------------------------------------------------

///  @brief Is every element negative one.

///