toolchain, options and flags cleanup

Author: emacski

Diff for: .bazelrc

@@ -43,24 +43,27 @@ build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0
 
 build --workspace_status_command=/proc/self/cwd/tools/gen_status_stamp.sh
 
-# Options for crossbuilding to armv7-a
-build:arm32v7 --crosstool_top=//tools/cpp/arm:toolchain
-build:arm32v7 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
-build:arm32v7 --cpu=arm
-build:arm32v7 --copt=-march=armv7-a
-build:arm32v7 --copt=-O3
-build:arm32v7 --copt=-DARM_NON_MOBILE
-build:arm32v7 --copt=-DRASPBERRY_PI
-build:arm32v7 --define LIBEVENT_TARGET_HOST=arm-linux-gnueabihf
-build:arm32v7 --define LIBEVENT_MARCH=-march=armv7-a
+### ARM cross-compile additions ###
+
+build --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
+build --copt=-funsafe-math-optimizations
+build --copt=-ftree-vectorize
+build --copt=-DARM_NON_MOBILE
+build --copt=-DRASPBERRY_PI
+build --linkopt=-Wl,--build-id=md5
+build --linkopt=-Wl,--hash-style=gnu
 
-# Options for crossbuilding to armv8-a
+# Options for armv8-a
 build:arm64v8 --crosstool_top=//tools/cpp/arm:toolchain
-build:arm64v8 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
 build:arm64v8 --cpu=aarch64
-build:arm64v8 --copt=-march=armv8-a
-build:arm64v8 --copt=-O3
-build:arm64v8 --copt=-DARM_NON_MOBILE
-build:arm64v8 --copt=-DRASPBERRY_PI
+build:arm64v8 --copt=-march=armv8-a+crc
 build:arm64v8 --define LIBEVENT_TARGET_HOST=aarch64-linux-gnu
-build:arm64v8 --define LIBEVENT_MARCH=-march=armv8-a
+build:arm64v8 --define LIBEVENT_MARCH=-march=armv8-a+crc
+
+# Options for armv7-a
+build:arm32v7 --crosstool_top=@local_config_arm_compiler//:toolchain
+build:arm32v7 --cpu=armeabi
+build:arm32v7 --copt=-march=armv7-a
+build:arm32v7 --define tensorflow_mkldnn_contraction_kernel=0
+build:arm32v7 --define LIBEVENT_TARGET_HOST=arm-linux-gnueabihf
+build:arm32v7 --define LIBEVENT_MARCH=-march=armv7-a

Diff for: Makefile

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 THIS_MAKE_FILE := $(lastword $(MAKEFILE_LIST))
 TFS_VERSION=1.14.0
 

Diff for: tensorflow_serving/tools/docker/Dockerfile.arm

@@ -1,4 +1,4 @@
-# Copyright 2018 Erik Maciejewski
+# Copyright 2019 Erik Maciejewski
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 ARG ARCH=arm64v8
 ARG TFS_VERSION=latest
 FROM tensorflow/serving:$TFS_VERSION-devel as devel

Diff for: tensorflow_serving/tools/docker/install_arm_toolchain.sh

@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
-# Copyright 2018 Erik Maciejewski
+# Copyright 2019 Erik Maciejewski
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ==============================================================================
+
 # install arm cross-compile toolchains
 apt-get update && \
 apt-get install -y \

Diff for: tools/cpp/arm/cc_toolchain_config.bzl

@@ -71,8 +71,6 @@ def _impl(ctx):
                                 "-Wl,-z,relro,-z,now",
                                 "-no-canonical-prefixes",
                                 "-pass-exit-codes",
-                                "-Wl,--build-id=md5",
-                                "-Wl,--hash-style=gnu"
                             ],
                         ),
                     ],
@@ -98,8 +96,6 @@ def _impl(ctx):
                                 "-Wl,-z,relro,-z,now",
                                 "-no-canonical-prefixes",
                                 "-pass-exit-codes",
-                                "-Wl,--build-id=md5",
-                                "-Wl,--hash-style=gnu"
                             ],
                         ),
                     ],
@@ -190,9 +186,9 @@ def _impl(ctx):
                             flags = [
                                 "-g0",
                                 "-O2",
-                                "-DNDEBUG",
                                 "-ffunction-sections",
                                 "-fdata-sections",
+                                "-DNDEBUG",
                             ],
                         ),
                     ],
@@ -220,7 +216,6 @@ def _impl(ctx):
                                 "-Wall",
                                 "-Wunused-but-set-parameter",
                                 "-Wno-free-nonheap-object",
-                                "-fno-omit-frame-pointer",
                             ],
                         ),
                     ],
@@ -237,9 +232,9 @@ def _impl(ctx):
                             flags = [
                                 "-g0",
                                 "-O2",
-                                "-DNDEBUG",
                                 "-ffunction-sections",
                                 "-fdata-sections",
+                                "-DNDEBUG",
                             ],
                         ),
                     ],