e5b335d367
Godot supports many different compilers and for production releases we have to support 3 currently: GCC8, Clang6, and MSVC2017. These compilers all do slightly different things with -ffast-math and it is causing issues now. See #24841, #24540, #10758, #10070. And probably other complaints about physics differences between release and release_debug builds. I've done some performance comparisons on Linux x86_64. All tests are ran 20 times. Bunnymark: (higher is better) (bunnies) min max stdev average fast-math 7332 7597 71 7432 this pr 7379 7779 108 7621 (102%) FPBench (gdscript port http://fpbench.org/) (lower is better) (ms) fast-math 15441 16127 192 15764 this pr 15671 16855 326 16001 (99%) Float_add (adding floats in a tight loop) (lower is better) (sec) fast-math 5.49 5.78 0.07 5.65 this pr 5.65 5.90 0.06 5.76 (98%) Float_div (dividing floats in a tight loop) (lower is better) (sec) fast-math 11.70 12.36 0.18 11.99 this pr 11.92 12.32 0.12 12.12 (99%) Float_mul (multiplying floats in a tight loop) (lower is better) (sec) fast-math 11.72 12.17 0.12 11.93 this pr 12.01 12.62 0.17 12.26 (97%) I have also looked at FPS numbers for tps-demo, 3d platformer, 2d platformer, and sponza and could not find any measurable difference. I believe that given the issues and oft-reported (physics) glitches on release builds I believe that the couple of percent of tight-loop floating point performance regression is well worth it. This fixes #24540 and fixes #24841
133 lines
4.8 KiB
Python
133 lines
4.8 KiB
Python
import os
|
|
import sys
|
|
from methods import detect_darwin_sdk_path
|
|
|
|
|
|
def is_active():
|
|
return True
|
|
|
|
|
|
def get_name():
|
|
return "OSX"
|
|
|
|
|
|
def can_build():
|
|
|
|
if (sys.platform == "darwin" or ("OSXCROSS_ROOT" in os.environ)):
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
def get_opts():
|
|
from SCons.Variables import BoolVariable, EnumVariable
|
|
|
|
return [
|
|
('osxcross_sdk', 'OSXCross SDK version', 'darwin14'),
|
|
('MACOS_SDK_PATH', 'Path to the macOS SDK', ''),
|
|
EnumVariable('debug_symbols', 'Add debugging symbols to release builds', 'yes', ('yes', 'no', 'full')),
|
|
BoolVariable('separate_debug_symbols', 'Create a separate file containing debugging symbols', False),
|
|
]
|
|
|
|
|
|
def get_flags():
|
|
|
|
return [
|
|
]
|
|
|
|
|
|
def configure(env):
|
|
|
|
## Build type
|
|
|
|
if (env["target"] == "release"):
|
|
if (env["optimize"] == "speed"): #optimize for speed (default)
|
|
env.Prepend(CCFLAGS=['-O3', '-fomit-frame-pointer', '-ftree-vectorize', '-msse2'])
|
|
else: #optimize for size
|
|
env.Prepend(CCFLAGS=['-Os','-ftree-vectorize', '-msse2'])
|
|
|
|
if (env["debug_symbols"] == "yes"):
|
|
env.Prepend(CCFLAGS=['-g1'])
|
|
if (env["debug_symbols"] == "full"):
|
|
env.Prepend(CCFLAGS=['-g2'])
|
|
|
|
elif (env["target"] == "release_debug"):
|
|
if (env["optimize"] == "speed"): #optimize for speed (default)
|
|
env.Prepend(CCFLAGS=['-O2', '-DDEBUG_ENABLED'])
|
|
else: #optimize for size
|
|
env.Prepend(CCFLAGS=['-Os', '-DDEBUG_ENABLED'])
|
|
if (env["debug_symbols"] == "yes"):
|
|
env.Prepend(CCFLAGS=['-g1'])
|
|
if (env["debug_symbols"] == "full"):
|
|
env.Prepend(CCFLAGS=['-g2'])
|
|
|
|
elif (env["target"] == "debug"):
|
|
env.Prepend(CCFLAGS=['-g3', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
|
|
|
|
## Architecture
|
|
|
|
# Mac OS X no longer runs on 32-bit since 10.7 which is unsupported since 2014
|
|
# As such, we only support 64-bit
|
|
env["bits"] = "64"
|
|
|
|
## Compiler configuration
|
|
|
|
# Save this in environment for use by other modules
|
|
if "OSXCROSS_ROOT" in os.environ:
|
|
env["osxcross"] = True
|
|
|
|
if not "osxcross" in env: # regular native build
|
|
env.Append(CCFLAGS=['-arch', 'x86_64'])
|
|
env.Append(LINKFLAGS=['-arch', 'x86_64'])
|
|
if (env["macports_clang"] != 'no'):
|
|
mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local")
|
|
mpclangver = env["macports_clang"]
|
|
env["CC"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang"
|
|
env["LINK"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++"
|
|
env["CXX"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++"
|
|
env['AR'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ar"
|
|
env['RANLIB'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ranlib"
|
|
env['AS'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-as"
|
|
env.Append(CCFLAGS=['-D__MACPORTS__']) #hack to fix libvpx MM256_BROADCASTSI128_SI256 define
|
|
|
|
detect_darwin_sdk_path('osx', env)
|
|
env.Append(CPPFLAGS=['-isysroot', '$MACOS_SDK_PATH'])
|
|
env.Append(LINKFLAGS=['-isysroot', '$MACOS_SDK_PATH'])
|
|
|
|
else: # osxcross build
|
|
root = os.environ.get("OSXCROSS_ROOT", 0)
|
|
basecmd = root + "/target/bin/x86_64-apple-" + env["osxcross_sdk"] + "-"
|
|
|
|
ccache_path = os.environ.get("CCACHE")
|
|
if ccache_path is None:
|
|
env['CC'] = basecmd + "cc"
|
|
env['CXX'] = basecmd + "c++"
|
|
else:
|
|
# there aren't any ccache wrappers available for OS X cross-compile,
|
|
# to enable caching we need to prepend the path to the ccache binary
|
|
env['CC'] = ccache_path + ' ' + basecmd + "cc"
|
|
env['CXX'] = ccache_path + ' ' + basecmd + "c++"
|
|
env['AR'] = basecmd + "ar"
|
|
env['RANLIB'] = basecmd + "ranlib"
|
|
env['AS'] = basecmd + "as"
|
|
env.Append(CCFLAGS=['-D__MACPORTS__']) #hack to fix libvpx MM256_BROADCASTSI128_SI256 define
|
|
|
|
if (env["CXX"] == "clang++"):
|
|
env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
|
|
env["CC"] = "clang"
|
|
env["LINK"] = "clang++"
|
|
|
|
## Dependencies
|
|
|
|
if env['builtin_libtheora']:
|
|
env["x86_libtheora_opt_gcc"] = True
|
|
|
|
## Flags
|
|
|
|
env.Append(CPPPATH=['#platform/osx'])
|
|
env.Append(CPPFLAGS=['-DOSX_ENABLED', '-DUNIX_ENABLED', '-DGLES_ENABLED', '-DAPPLE_STYLE_KEYS', '-DCOREAUDIO_ENABLED', '-DCOREMIDI_ENABLED'])
|
|
env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-framework', 'CoreAudio', '-framework', 'CoreMIDI', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback'])
|
|
env.Append(LIBS=['pthread'])
|
|
|
|
env.Append(CPPFLAGS=['-mmacosx-version-min=10.9'])
|
|
env.Append(LINKFLAGS=['-mmacosx-version-min=10.9'])
|