diff --git a/arm_compiler.BUILD b/arm_compiler.BUILD new file mode 100644 index 00000000000..b231d0180e3 --- /dev/null +++ b/arm_compiler.BUILD @@ -0,0 +1,81 @@ +package(default_visibility = ['//visibility:public']) + +filegroup( + name = 'gcc', + srcs = [ + 'bin/arm-linux-gnueabihf-gcc', + ], +) + +filegroup( + name = 'ar', + srcs = [ + 'bin/arm-linux-gnueabihf-ar', + ], +) + +filegroup( + name = 'ld', + srcs = [ + 'bin/arm-linux-gnueabihf-ld', + ], +) + +filegroup( + name = 'nm', + srcs = [ + 'bin/arm-linux-gnueabihf-nm', + ], +) + +filegroup( + name = 'objcopy', + srcs = [ + 'bin/arm-linux-gnueabihf-objcopy', + ], +) + +filegroup( + name = 'objdump', + srcs = [ + 'bin/arm-linux-gnueabihf-objdump', + ], +) + +filegroup( + name = 'strip', + srcs = [ + 'bin/arm-linux-gnueabihf-strip', + ], +) + +filegroup( + name = 'as', + srcs = [ + 'bin/arm-linux-gnueabihf-as', + ], +) + +filegroup( + name = 'compiler_pieces', + srcs = glob([ + 'arm-linux-gnueabihf/**', + 'libexec/**', + 'lib/gcc/arm-linux-gnueabihf/**', + 'include/**', + ]), +) + +filegroup( + name = 'compiler_components', + srcs = [ + ':gcc', + ':ar', + ':ld', + ':nm', + ':objcopy', + ':objdump', + ':strip', + ':as', + ], +) diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile index fc465ab380b..2e45ddad54b 100644 --- a/tensorflow/contrib/makefile/Makefile +++ b/tensorflow/contrib/makefile/Makefile @@ -202,7 +202,7 @@ ifeq ($(TARGET),LINUX) endif # If we're cross-compiling for the Raspberry Pi, use the right gcc. ifeq ($(TARGET),PI) - CXXFLAGS += -D__ANDROID_TYPES_SLIM__ + CXXFLAGS += -D__ANDROID_TYPES_SLIM__ -DRASPBERRY_PI LDFLAGS := -Wl,--no-whole-archive LIBS += -ldl -lpthread LIBFLAGS += -Wl,--allow-multiple-definition -Wl,--whole-archive diff --git a/tensorflow/core/platform/platform.h b/tensorflow/core/platform/platform.h index 7c44b22eff6..12120c4ab96 100644 --- a/tensorflow/core/platform/platform.h +++ b/tensorflow/core/platform/platform.h @@ -43,9 +43,10 @@ limitations under the License. #elif defined(__arm__) #define PLATFORM_POSIX -// Since there's no macro for the Raspberry Pi, assume we're on a mobile -// platform if we're compiling for the ARM CPU. +// Require an outside macro to tell us if we're building for Raspberry Pi. +#if !defined(RASPBERRY_PI) #define IS_MOBILE_PLATFORM +#endif // !defined(RASPBERRY_PI) #else // If no platform specified, use: diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 71e4b8f5bb3..6dd3fc4acd5 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -3,9 +3,12 @@ load("//third_party/gpus:cuda_configure.bzl", "cuda_configure") load("//third_party/sycl:sycl_configure.bzl", "sycl_configure") load("//third_party/mkl:build_defs.bzl", "mkl_repository") -load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external") +load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", + "java_import_external") load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external") load("//third_party/py:python_configure.bzl", "python_configure") +load("//third_party/toolchains/cpus/arm:arm_compiler_configure.bzl", + "arm_compiler_configure") def _is_windows(repository_ctx): @@ -83,7 +86,6 @@ temp_workaround_http_archive = repository_rule( }, ) - # Executes specified command with arguments and calls 'fail' if it exited with # non-zero code def _execute_and_check_ret_code(repo_ctx, cmd_and_args): @@ -142,6 +144,12 @@ def tf_workspace(path_prefix="", tf_repo_name=""): sycl_configure(name="local_config_sycl") python_configure(name="local_config_python") + # Point //external/local_config_arm_compiler to //external/arm_compiler + arm_compiler_configure( + name="local_config_arm_compiler", + remote_config_repo="../arm_compiler", + build_file = str(Label("//third_party/toolchains/cpus/arm:BUILD"))) + mkl_repository( name = "mkl", urls = [ @@ -169,6 +177,17 @@ def tf_workspace(path_prefix="", tf_repo_name=""): build_file = str(Label("//third_party:eigen.BUILD")), ) + native.new_http_archive( + name = "arm_compiler", + build_file = str(Label("//:arm_compiler.BUILD")), + sha256 = "970285762565c7890c6c087d262b0a18286e7d0384f13a37786d8521773bc969", + strip_prefix = "tools-0e906ebc527eab1cdbf7adabff5b474da9562e9f/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf", + urls = [ + "http://mirror.bazel.build/github.com/raspberrypi/tools/archive/0e906ebc527eab1cdbf7adabff5b474da9562e9f.tar.gz", + "https://github.com/raspberrypi/tools/archive/0e906ebc527eab1cdbf7adabff5b474da9562e9f.tar.gz", + ], + ) + native.new_http_archive( name = "libxsmm_archive", urls = [ diff --git a/third_party/toolchains/cpus/arm/BUILD b/third_party/toolchains/cpus/arm/BUILD new file mode 100644 index 00000000000..10c7867c233 --- /dev/null +++ b/third_party/toolchains/cpus/arm/BUILD @@ -0,0 +1,49 @@ +package(default_visibility = ["//visibility:public"]) + +cc_toolchain_suite( + name = "toolchain", + toolchains = { + "armeabi|compiler": ":cc-compiler-armeabi", + "local|compiler": ":cc-compiler-local", + }, +) + +filegroup( + name = "empty", + srcs = [], +) + +filegroup( + name = "arm_linux_all_files", + srcs = [ + "@arm_compiler//:compiler_pieces", + ], +) + +cc_toolchain( + name = "cc-compiler-local", + all_files = ":empty", + compiler_files = ":empty", + cpu = "local", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":empty", + objcopy_files = ":empty", + static_runtime_libs = [":empty"], + strip_files = ":empty", + supports_param_files = 1, +) + +cc_toolchain( + name = "cc-compiler-armeabi", + all_files = ":arm_linux_all_files", + compiler_files = ":arm_linux_all_files", + cpu = "armeabi", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":arm_linux_all_files", + objcopy_files = "arm_linux_all_files", + static_runtime_libs = [":empty"], + strip_files = "arm_linux_all_files", + supports_param_files = 1, +) diff --git a/third_party/toolchains/cpus/arm/CROSSTOOL.tpl b/third_party/toolchains/cpus/arm/CROSSTOOL.tpl new file mode 100644 index 00000000000..6753476c153 --- /dev/null +++ b/third_party/toolchains/cpus/arm/CROSSTOOL.tpl @@ -0,0 +1,874 @@ +major_version: "local" +minor_version: "" +default_target_cpu: "same_as_host" + +default_toolchain { + cpu: "k8" + toolchain_identifier: "local_linux" +} +default_toolchain { + cpu: "piii" + toolchain_identifier: "local_linux" +} +default_toolchain { + cpu: "darwin" + toolchain_identifier: "local_darwin" +} +default_toolchain { + cpu: "freebsd" + toolchain_identifier: "local_freebsd" +} +default_toolchain { + cpu: "armeabi" + toolchain_identifier: "arm-linux-gnueabihf" +} +default_toolchain { + cpu: "arm" + toolchain_identifier: "local_linux" +} +default_toolchain { + cpu: "x64_windows" + toolchain_identifier: "local_windows_msys64" +} +default_toolchain { + cpu: "x64_windows_msvc" + toolchain_identifier: "vc_14_0_x64" +} +default_toolchain { + cpu: "s390x" + toolchain_identifier: "local_linux" +} + +toolchain { + abi_version: "armeabi" + abi_libc_version: "armeabi" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "armeabi" + needsPic: true + supports_gold_linker: false + supports_incremental_linker: false + supports_fission: false + supports_interface_shared_objects: false + supports_normalizing_ar: false + supports_start_end_lib: false + target_libc: "armeabi" + target_cpu: "armeabi" + target_system_name: "armeabi" + toolchain_identifier: "arm-linux-gnueabihf" + + tool_path { name: "ar" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-ar" } + tool_path { name: "compat-ld" path: "/bin/false" } + tool_path { name: "cpp" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-cpp" } + tool_path { name: "dwp" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-dwp" } + tool_path { name: "gcc" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-gcc" } + tool_path { name: "gcov" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-gcov" } + tool_path { name: "ld" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-ld" } + + tool_path { name: "nm" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-nm" } + tool_path { name: "objcopy" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-objcopy" } + tool_path { name: "objdump" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-objdump" } + tool_path { name: "strip" path: "%{ARM_COMPILER_PATH}%/bin/arm-linux-gnueabihf-strip" } + + cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/arm-linux-gnueabihf/include/c++/4.9.3/" + cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/arm-linux-gnueabihf/sysroot/usr/include/" + cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/arm-linux-gnueabihf/libc/usr/include/" + cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/lib/gcc/arm-linux-gnueabihf/4.9.3/include" + cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed" + cxx_builtin_include_directory: "%{ARM_COMPILER_PATH}%/local_include" + cxx_builtin_include_directory: "/usr/include" + + cxx_flag: "-std=c++11" + # The cxx_builtin_include_directory directives don't seem to be adding these, so + # explicitly set them as flags. There's a query to the Bazel team outstanding about + # why this is necessary. + cxx_flag: "-isystem" + cxx_flag: "/usr/include/arm-linux-gnueabihf" + cxx_flag: "-isystem" + cxx_flag: "/usr/include/python2.7" + cxx_flag: "-isystem" + cxx_flag: "/usr/include/" + linker_flag: "-lstdc++" + + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + unfiltered_cxx_flag: "-no-canonical-prefixes" + unfiltered_cxx_flag: "-fno-canonical-system-headers" + + compiler_flag: "-U_FORTIFY_SOURCE" + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + compiler_flag: "-DRASPBERRY_PI" # To differentiate from mobile builds. + linker_flag: "-Wl,-z,relro,-z,now" + + linker_flag: "-no-canonical-prefixes" + linker_flag: "-pass-exit-codes" + + linker_flag: "-Wl,--build-id=md5" + linker_flag: "-Wl,--hash-style=gnu" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or + # even generally? However, that can't happen here, as it requires special + # handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + linker_flag: "-Wl,--gc-sections" + } + linking_mode_flags { mode: DYNAMIC } + +} + +toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + supports_gold_linker: false + supports_incremental_linker: false + supports_fission: false + supports_interface_shared_objects: false + supports_normalizing_ar: false + supports_start_end_lib: false + target_libc: "local" + target_cpu: "local" + target_system_name: "local" + toolchain_identifier: "local_linux" + + tool_path { name: "ar" path: "/usr/bin/ar" } + tool_path { name: "compat-ld" path: "/usr/bin/ld" } + tool_path { name: "cpp" path: "/usr/bin/cpp" } + tool_path { name: "dwp" path: "/usr/bin/dwp" } + tool_path { name: "gcc" path: "/usr/bin/gcc" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + linker_flag: "-B/usr/bin/" + + # TODO(bazel-team): In theory, the path here ought to exactly match the path + # used by gcc. That works because bazel currently doesn't track files at + # absolute locations and has no remote execution, yet. However, this will need + # to be fixed, maybe with auto-detection? + cxx_builtin_include_directory: "/usr/lib/gcc/" + cxx_builtin_include_directory: "/usr/local/include" + cxx_builtin_include_directory: "/usr/include" + tool_path { name: "gcov" path: "/usr/bin/gcov" } + + # C(++) compiles invoke the compiler (as that is the one knowing where + # to find libraries), but we provide LD so other rules can invoke the linker. + tool_path { name: "ld" path: "/usr/bin/ld" } + + tool_path { name: "nm" path: "/usr/bin/nm" } + tool_path { name: "objcopy" path: "/usr/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "/usr/bin/objdump" } + tool_path { name: "strip" path: "/usr/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + unfiltered_cxx_flag: "-fno-canonical-system-headers" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + # We need to undef it before redefining it as some distributions now have + # it enabled by default. + compiler_flag: "-U_FORTIFY_SOURCE" + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + linker_flag: "-Wl,-z,relro,-z,now" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. This isn't supported by gcc + # on Ubuntu 14.04. + # compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wunused-but-set-parameter" + # But disable some that are problematic. + compiler_flag: "-Wno-free-nonheap-object" # has false positives + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + # Have gcc return the exit code from ld. + linker_flag: "-pass-exit-codes" + # Stamp the binary with a unique identifier. + linker_flag: "-Wl,--build-id=md5" + linker_flag: "-Wl,--hash-style=gnu" + # Gold linker only? Can we enable this by default? + # linker_flag: "-Wl,--warn-execstack" + # linker_flag: "-Wl,--detect-odr-violations" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or + # even generally? However, that can't happen here, as it requires special + # handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + linker_flag: "-Wl,--gc-sections" + } + linking_mode_flags { mode: DYNAMIC } +} + +toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + target_libc: "macosx" + target_cpu: "darwin" + target_system_name: "local" + toolchain_identifier: "local_darwin" + + tool_path { name: "ar" path: "/usr/bin/libtool" } + tool_path { name: "compat-ld" path: "/usr/bin/ld" } + tool_path { name: "cpp" path: "/usr/bin/cpp" } + tool_path { name: "dwp" path: "/usr/bin/dwp" } + tool_path { name: "gcc" path: "osx_cc_wrapper.sh" } + cxx_flag: "-std=c++0x" + ar_flag: "-static" + ar_flag: "-s" + ar_flag: "-o" + linker_flag: "-lstdc++" + linker_flag: "-undefined" + linker_flag: "dynamic_lookup" + linker_flag: "-headerpad_max_install_names" + # TODO(ulfjack): This is wrong on so many levels. Figure out a way to auto-detect the proper + # setting from the local compiler, and also how to make incremental builds correct. + cxx_builtin_include_directory: "/" + tool_path { name: "gcov" path: "/usr/bin/gcov" } + tool_path { name: "ld" path: "/usr/bin/ld" } + tool_path { name: "nm" path: "/usr/bin/nm" } + tool_path { name: "objcopy" path: "/usr/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "/usr/bin/objdump" } + tool_path { name: "strip" path: "/usr/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. + compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wthread-safety" + compiler_flag: "-Wself-assign" + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or even generally? + # However, that can't happen here, as it requires special handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + } + linking_mode_flags { mode: DYNAMIC } +} + +toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + supports_gold_linker: false + supports_incremental_linker: false + supports_fission: false + supports_interface_shared_objects: false + supports_normalizing_ar: false + supports_start_end_lib: false + target_libc: "local" + target_cpu: "freebsd" + target_system_name: "local" + toolchain_identifier: "local_freebsd" + + tool_path { name: "ar" path: "/usr/bin/ar" } + tool_path { name: "compat-ld" path: "/usr/bin/ld" } + tool_path { name: "cpp" path: "/usr/bin/cpp" } + tool_path { name: "dwp" path: "/usr/bin/dwp" } + tool_path { name: "gcc" path: "/usr/bin/clang" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + linker_flag: "-B/usr/bin/" + + # TODO(bazel-team): In theory, the path here ought to exactly match the path + # used by gcc. That works because bazel currently doesn't track files at + # absolute locations and has no remote execution, yet. However, this will need + # to be fixed, maybe with auto-detection? + cxx_builtin_include_directory: "/usr/lib/clang" + cxx_builtin_include_directory: "/usr/local/include" + cxx_builtin_include_directory: "/usr/include" + tool_path { name: "gcov" path: "/usr/bin/gcov" } + + # C(++) compiles invoke the compiler (as that is the one knowing where + # to find libraries), but we provide LD so other rules can invoke the linker. + tool_path { name: "ld" path: "/usr/bin/ld" } + + tool_path { name: "nm" path: "/usr/bin/nm" } + tool_path { name: "objcopy" path: "/usr/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "/usr/bin/objdump" } + tool_path { name: "strip" path: "/usr/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + # We need to undef it before redefining it as some distributions now have + # it enabled by default. + compiler_flag: "-U_FORTIFY_SOURCE" + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + linker_flag: "-Wl,-z,relro,-z,now" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. This isn't supported by gcc + # on Ubuntu 14.04. + # compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + #compiler_flag: "-Wunused-but-set-parameter" + # But disable some that are problematic. + #compiler_flag: "-Wno-free-nonheap-object" # has false positives + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + # Have gcc return the exit code from ld. + #linker_flag: "-pass-exit-codes" + # Stamp the binary with a unique identifier. + #linker_flag: "-Wl,--build-id=md5" + linker_flag: "-Wl,--hash-style=gnu" + # Gold linker only? Can we enable this by default? + # linker_flag: "-Wl,--warn-execstack" + # linker_flag: "-Wl,--detect-odr-violations" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or + # even generally? However, that can't happen here, as it requires special + # handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + linker_flag: "-Wl,--gc-sections" + } + linking_mode_flags { mode: DYNAMIC } +} + +toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "windows_mingw" + host_system_name: "local" + needsPic: false + target_libc: "local" + target_cpu: "x64_windows" + target_system_name: "local" + toolchain_identifier: "local_windows_mingw" + + tool_path { name: "ar" path: "C:/mingw/bin/ar" } + tool_path { name: "compat-ld" path: "C:/mingw/bin/ld" } + tool_path { name: "cpp" path: "C:/mingw/bin/cpp" } + tool_path { name: "dwp" path: "C:/mingw/bin/dwp" } + tool_path { name: "gcc" path: "C:/mingw/bin/gcc" } + cxx_flag: "-std=c++0x" + # TODO(bazel-team): In theory, the path here ought to exactly match the path + # used by gcc. That works because bazel currently doesn't track files at + # absolute locations and has no remote execution, yet. However, this will need + # to be fixed, maybe with auto-detection? + cxx_builtin_include_directory: "C:/mingw/include" + cxx_builtin_include_directory: "C:/mingw/lib/gcc" + tool_path { name: "gcov" path: "C:/mingw/bin/gcov" } + tool_path { name: "ld" path: "C:/mingw/bin/ld" } + tool_path { name: "nm" path: "C:/mingw/bin/nm" } + tool_path { name: "objcopy" path: "C:/mingw/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "C:/mingw/bin/objdump" } + tool_path { name: "strip" path: "C:/mingw/bin/strip" } + linking_mode_flags { mode: DYNAMIC } +} + +toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "windows_msys64_mingw64" + host_system_name: "local" + needsPic: false + target_libc: "local" + target_cpu: "x64_windows" + target_system_name: "local" + toolchain_identifier: "local_windows_msys64_mingw64" + + tool_path { name: "ar" path: "C:/tools/msys64/mingw64/bin/ar" } + tool_path { name: "compat-ld" path: "C:/tools/msys64/mingw64/bin/ld" } + tool_path { name: "cpp" path: "C:/tools/msys64/mingw64/bin/cpp" } + tool_path { name: "dwp" path: "C:/tools/msys64/mingw64/bin/dwp" } + tool_path { name: "gcc" path: "C:/tools/msys64/mingw64/bin/gcc" } + cxx_flag: "-std=c++0x" + # TODO(bazel-team): In theory, the path here ought to exactly match the path + # used by gcc. That works because bazel currently doesn't track files at + # absolute locations and has no remote execution, yet. However, this will need + # to be fixed, maybe with auto-detection? + cxx_builtin_include_directory: "C:/tools/msys64/mingw64/x86_64-w64-mingw32/include" + tool_path { name: "gcov" path: "C:/tools/msys64/mingw64/bin/gcov" } + tool_path { name: "ld" path: "C:/tools/msys64/mingw64/bin/ld" } + tool_path { name: "nm" path: "C:/tools/msys64/mingw64/bin/nm" } + tool_path { name: "objcopy" path: "C:/tools/msys64/mingw64/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "C:/tools/msys64/mingw64/bin/objdump" } + tool_path { name: "strip" path: "C:/tools/msys64/mingw64/bin/strip" } + linking_mode_flags { mode: DYNAMIC } +} + +toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "windows_clang" + host_system_name: "local" + needsPic: false + target_libc: "local" + target_cpu: "x64_windows" + target_system_name: "local" + toolchain_identifier: "local_windows_clang" + + tool_path { name: "ar" path: "C:/mingw/bin/ar" } + tool_path { name: "compat-ld" path: "C:/Program Files (x86)/LLVM/bin/ld" } + tool_path { name: "cpp" path: "C:/Program Files (x86)/LLVM/bin/cpp" } + tool_path { name: "dwp" path: "C:/Program Files (x86)/LLVM/bin/dwp" } + tool_path { name: "gcc" path: "C:/Program Files (x86)/LLVM/bin/clang" } + cxx_flag: "-std=c++0x" + # TODO(bazel-team): In theory, the path here ought to exactly match the path + # used by gcc. That works because bazel currently doesn't track files at + # absolute locations and has no remote execution, yet. However, this will need + # to be fixed, maybe with auto-detection? + cxx_builtin_include_directory: "/usr/lib/gcc/" + cxx_builtin_include_directory: "/usr/local/include" + cxx_builtin_include_directory: "/usr/include" + tool_path { name: "gcov" path: "C:/Program Files (x86)/LLVM/bin/gcov" } + tool_path { name: "ld" path: "C:/Program Files (x86)/LLVM/bin/ld" } + tool_path { name: "nm" path: "C:/Program Files (x86)/LLVM/bin/nm" } + tool_path { name: "objcopy" path: "C:/Program Files (x86)/LLVM/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "C:/Program Files (x86)/LLVM/bin/objdump" } + tool_path { name: "strip" path: "C:/Program Files (x86)/LLVM/bin/strip" } + linking_mode_flags { mode: DYNAMIC } +} + +toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "windows_msys64" + host_system_name: "local" + needsPic: false + target_libc: "local" + target_cpu: "x64_windows" + target_system_name: "local" + toolchain_identifier: "local_windows_msys64" + + tool_path { name: "ar" path: "C:/tools/msys64/usr/bin/ar" } + tool_path { name: "compat-ld" path: "C:/tools/msys64/usr/bin/ld" } + tool_path { name: "cpp" path: "C:/tools/msys64/usr/bin/cpp" } + tool_path { name: "dwp" path: "C:/tools/msys64/usr/bin/dwp" } + # Use gcc instead of g++ so that C will compile correctly. + tool_path { name: "gcc" path: "C:/tools/msys64/usr/bin/gcc" } + cxx_flag: "-std=gnu++0x" + linker_flag: "-lstdc++" + # TODO(bazel-team): In theory, the path here ought to exactly match the path + # used by gcc. That works because bazel currently doesn't track files at + # absolute locations and has no remote execution, yet. However, this will need + # to be fixed, maybe with auto-detection? + cxx_builtin_include_directory: "C:/tools/msys64/" + cxx_builtin_include_directory: "/usr/" + tool_path { name: "gcov" path: "C:/tools/msys64/usr/bin/gcov" } + tool_path { name: "ld" path: "C:/tools/msys64/usr/bin/ld" } + tool_path { name: "nm" path: "C:/tools/msys64/usr/bin/nm" } + tool_path { name: "objcopy" path: "C:/tools/msys64/usr/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "C:/tools/msys64/usr/bin/objdump" } + tool_path { name: "strip" path: "C:/tools/msys64/usr/bin/strip" } + linking_mode_flags { mode: DYNAMIC } +} + +toolchain { + toolchain_identifier: "vc_14_0_x64" + host_system_name: "local" + target_system_name: "local" + + abi_version: "local" + abi_libc_version: "local" + target_cpu: "x64_windows_msvc" + compiler: "cl" + target_libc: "msvcrt140" + default_python_version: "python2.7" + cxx_builtin_include_directory: "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/INCLUDE" + cxx_builtin_include_directory: "C:/Program Files (x86)/Windows Kits/10/include/" + cxx_builtin_include_directory: "C:/Program Files (x86)/Windows Kits/8.1/include/" + cxx_builtin_include_directory: "C:/Program Files (x86)/GnuWin32/include/" + cxx_builtin_include_directory: "C:/python_27_amd64/files/include" + tool_path { + name: "ar" + path: "wrapper/bin/msvc_link.bat" + } + tool_path { + name: "cpp" + path: "wrapper/bin/msvc_cl.bat" + } + tool_path { + name: "gcc" + path: "wrapper/bin/msvc_cl.bat" + } + tool_path { + name: "gcov" + path: "wrapper/bin/msvc_nop.bat" + } + tool_path { + name: "ld" + path: "wrapper/bin/msvc_link.bat" + } + tool_path { + name: "nm" + path: "wrapper/bin/msvc_nop.bat" + } + tool_path { + name: "objcopy" + path: "wrapper/bin/msvc_nop.bat" + } + tool_path { + name: "objdump" + path: "wrapper/bin/msvc_nop.bat" + } + tool_path { + name: "strip" + path: "wrapper/bin/msvc_nop.bat" + } + supports_gold_linker: false + supports_start_end_lib: false + supports_interface_shared_objects: false + supports_incremental_linker: false + supports_normalizing_ar: true + needsPic: false + + compiler_flag: "-m64" + compiler_flag: "/D__inline__=__inline" + # TODO(pcloudy): Review those flags below, they should be defined by cl.exe + compiler_flag: "/DOS_WINDOWS=OS_WINDOWS" + compiler_flag: "/DCOMPILER_MSVC" + + # Don't pollute with GDI macros in windows.h. + compiler_flag: "/DNOGDI" + # Don't define min/max macros in windows.h. + compiler_flag: "/DNOMINMAX" + compiler_flag: "/DPRAGMA_SUPPORTED" + # Platform defines. + compiler_flag: "/D_WIN32_WINNT=0x0600" + # Turn off warning messages. + compiler_flag: "/D_CRT_SECURE_NO_DEPRECATE" + compiler_flag: "/D_CRT_SECURE_NO_WARNINGS" + compiler_flag: "/D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS" + # Use math constants (M_PI, etc.) from the math library + compiler_flag: "/D_USE_MATH_DEFINES" + + # Useful options to have on for compilation. + # Suppress startup banner. + compiler_flag: "/nologo" + # Increase the capacity of object files to 2^32 sections. + compiler_flag: "/bigobj" + # Allocate 500MB for precomputed headers. + compiler_flag: "/Zm500" + # Use unsigned char by default. + compiler_flag: "/J" + # Use function level linking. + compiler_flag: "/Gy" + # Use string pooling. + compiler_flag: "/GF" + # Warning level 3 (could possibly go to 4 in the future). + compiler_flag: "/W3" + # Catch both asynchronous (structured) and synchronous (C++) exceptions. + compiler_flag: "/EHsc" + + # Globally disabled warnings. + # Don't warn about elements of array being be default initialized. + compiler_flag: "/wd4351" + # Don't warn about no matching delete found. + compiler_flag: "/wd4291" + # Don't warn about diamond inheritance patterns. + compiler_flag: "/wd4250" + # Don't warn about insecure functions (e.g. non _s functions). + compiler_flag: "/wd4996" + + linker_flag: "-m64" + + feature { + name: 'include_paths' + flag_set { + action: 'preprocess-assemble' + action: 'c-compile' + action: 'c++-compile' + action: 'c++-header-parsing' + action: 'c++-header-preprocessing' + action: 'c++-module-compile' + flag_group { + flag: '/I%{quote_include_paths}' + } + flag_group { + flag: '/I%{include_paths}' + } + flag_group { + flag: '/I%{system_include_paths}' + } + } + } + + feature { + name: 'dependency_file' + flag_set { + action: 'assemble' + action: 'preprocess-assemble' + action: 'c-compile' + action: 'c++-compile' + action: 'c++-module-compile' + action: 'c++-header-preprocessing' + action: 'c++-header-parsing' + expand_if_all_available: 'dependency_file' + flag_group { + flag: '/DEPENDENCY_FILE' + flag: '%{dependency_file}' + } + } + } + + # Stop passing -frandom-seed option + feature { + name: 'random_seed' + } + + # This feature is just for enabling flag_set in action_config for -c and -o options during the transitional period + feature { + name: 'compile_action_flags_in_flag_set' + } + + action_config { + config_name: 'c-compile' + action_name: 'c-compile' + tool { + tool_path: 'wrapper/bin/msvc_cl.bat' + } + flag_set { + flag_group { + flag: '/c' + flag: '%{source_file}' + } + } + flag_set { + expand_if_all_available: 'output_object_file' + flag_group { + flag: '/Fo%{output_object_file}' + } + } + flag_set { + expand_if_all_available: 'output_assembly_file' + flag_group { + flag: '/Fa%{output_assembly_file}' + } + } + flag_set { + expand_if_all_available: 'output_preprocess_file' + flag_group { + flag: '/P' + flag: '/Fi%{output_preprocess_file}' + } + } + } + + action_config { + config_name: 'c++-compile' + action_name: 'c++-compile' + tool { + tool_path: 'wrapper/bin/msvc_cl.bat' + } + flag_set { + flag_group { + flag: '/c' + flag: '%{source_file}' + } + } + flag_set { + expand_if_all_available: 'output_object_file' + flag_group { + flag: '/Fo%{output_object_file}' + } + } + flag_set { + expand_if_all_available: 'output_assembly_file' + flag_group { + flag: '/Fa%{output_assembly_file}' + } + } + flag_set { + expand_if_all_available: 'output_preprocess_file' + flag_group { + flag: '/P' + flag: '/Fi%{output_preprocess_file}' + } + } + } + + compilation_mode_flags { + mode: DBG + compiler_flag: "/DDEBUG=1" + # This will signal the wrapper that we are doing a debug build, which sets + # some internal state of the toolchain wrapper. It is intentionally a "-" + # flag to make this very obvious. + compiler_flag: "-g" + compiler_flag: "/Od" + compiler_flag: "-Xcompilation-mode=dbg" + } + + compilation_mode_flags { + mode: FASTBUILD + compiler_flag: "/DNDEBUG" + compiler_flag: "/Od" + compiler_flag: "-Xcompilation-mode=fastbuild" + } + + compilation_mode_flags { + mode: OPT + compiler_flag: "/DNDEBUG" + compiler_flag: "/O2" + compiler_flag: "-Xcompilation-mode=opt" + } +} diff --git a/third_party/toolchains/cpus/arm/arm_compiler_configure.bzl b/third_party/toolchains/cpus/arm/arm_compiler_configure.bzl new file mode 100644 index 00000000000..5eb3b7bb1c6 --- /dev/null +++ b/third_party/toolchains/cpus/arm/arm_compiler_configure.bzl @@ -0,0 +1,27 @@ +# -*- Python -*- +"""Repository rule for arm compiler autoconfiguration.""" + +def _tpl(repository_ctx, tpl, substitutions={}, out=None): + if not out: + out = tpl + repository_ctx.template( + out, + Label("//third_party/toolchains/cpus/arm:%s.tpl" % tpl), + substitutions) + + +def _arm_compiler_configure_impl(repository_ctx): + _tpl(repository_ctx, "CROSSTOOL", { + "%{ARM_COMPILER_PATH}%": str(repository_ctx.path( + repository_ctx.attr.remote_config_repo)), + }) + repository_ctx.symlink(repository_ctx.attr.build_file, "BUILD") + + +arm_compiler_configure = repository_rule( + implementation = _arm_compiler_configure_impl, + attrs = { + "remote_config_repo": attr.string(mandatory = False, default =""), + "build_file": attr.label(), + }, +) diff --git a/third_party/toolchains/cpus/arm/build_raspberry_pi.sh b/third_party/toolchains/cpus/arm/build_raspberry_pi.sh new file mode 100755 index 00000000000..a5ad0fce0e4 --- /dev/null +++ b/third_party/toolchains/cpus/arm/build_raspberry_pi.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env bash +set -e + +# By default this builds packages for the Pi Two and Three only, since the NEON support +# this allows makes calculations many times faster. To support the Pi One or Zero, pass +# PI_ONE as the first argument to the script, for example: +# third_party/toolchains/cpus/arm/build_raspberry_pi.sh PI_ONE +# +# To install the cross-compilation support for Python this script needs on Ubuntu Trusty, run +# something like these steps, after backing up your original /etc/apt/sources.list file: +# +# dpkg --add-architecture armhf +# echo 'deb [arch=armhf] http://ports.ubuntu.com/ trusty main restricted universe multiverse' >> /etc/apt/sources.list.d/armhf.list +# echo 'deb [arch=armhf] http://ports.ubuntu.com/ trusty-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/armhf.list +# echo 'deb [arch=armhf] http://ports.ubuntu.com/ trusty-security main restricted universe multiverse' >> /etc/apt/sources.list.d/armhf.list +# echo 'deb [arch=armhf] http://ports.ubuntu.com/ trusty-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/armhf.list +# sed -i 's#deb http://archive.ubuntu.com/ubuntu/#deb [arch=amd64] http://archive.ubuntu.com/ubuntu/#g' /etc/apt/sources.list +# apt-get update +# apt-get install -y libpython-all-dev:armhf +# +# Make sure you have an up to date version of the Bazel build tool installed too. + +yes '' | ./configure + +if [[ $1 == "PI_ONE" ]]; then + PI_COPTS="--copt=-march=armv6 --copt=-mfpu=vfp" + echo "Building for the Pi One/Zero, with no NEON support" +else + PI_COPTS='--copt=-march=armv7-a --copt=-mfpu=neon-vfpv4 + --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 + --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 + --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8' + echo "Building for the Pi Two/Three, with NEON acceleration" +fi + +bazel build -c opt ${PI_COPTS} \ + --copt=-funsafe-math-optimizations --copt=-ftree-vectorize \ + --copt=-fomit-frame-pointer --cpu=armeabi \ + --crosstool_top=@local_config_arm_compiler//:toolchain \ + --verbose_failures \ + //tensorflow/tools/benchmark:benchmark_model \ + //tensorflow/tools/pip_package:build_pip_package + +TMPDIR=$(mktemp -d -t tmp.XXXXXXXXXX) +echo "Final outputs will go to ${TMPDIR}" + +# Build a universal wheel. +BDIST_OPTS="--universal" \ + bazel-bin/tensorflow/tools/pip_package/build_pip_package "${TMPDIR}" + +OLD_FN=$(ls "${TMPDIR}" | grep \.whl) +SUB='s/tensorflow-([^-]+)-([^-]+)-.*/tensorflow-\1-\2-none-any.whl/; print' +NEW_FN=$(echo "${OLD_FN}" | perl -ne "${SUB}") +mv "${TMPDIR}/${OLD_FN}" "${TMPDIR}/${NEW_FN}" +cp bazel-bin/tensorflow/tools/benchmark/benchmark_model "${TMPDIR}" + +echo "Output can be found here:" +find "${TMPDIR}"