From abdd3aeadbe3e0e4d7b06a7947b34d9e6e3117bb Mon Sep 17 00:00:00 2001 From: batzor <32958247+batzor@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:47:53 +0900 Subject: [PATCH 1/2] build: rename `tachyon_openmp` to `tachyon_openmp_copts` --- bazel/tachyon_cc.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel/tachyon_cc.bzl b/bazel/tachyon_cc.bzl index ee1b64aef2..eb3debc5bd 100644 --- a/bazel/tachyon_cc.bzl +++ b/bazel/tachyon_cc.bzl @@ -33,7 +33,7 @@ def tachyon_rtti(force_rtti): def tachyon_simd_copts(): return if_linux_x86_64(["-msse3"]) -def tachyon_openmp(): +def tachyon_openmp_copts(): return select({ "@kroma_network_tachyon//:tachyon_has_openmp_on_macos": ["-Xclang -fopenmp"], "@kroma_network_tachyon//:tachyon_has_openmp": ["-fopenmp"], @@ -41,7 +41,7 @@ def tachyon_openmp(): }) def tachyon_copts(safe_code = True): - return tachyon_warnings(safe_code) + tachyon_hide_symbols() + tachyon_simd_copts() + tachyon_openmp() + return tachyon_warnings(safe_code) + tachyon_hide_symbols() + tachyon_simd_copts() + tachyon_openmp_copts() def tachyon_cxxopts(safe_code = True, force_exceptions = False, force_rtti = False): return tachyon_copts(safe_code) + tachyon_exceptions(force_exceptions) + tachyon_rtti(force_rtti) From 3d47ceefd95015848499e1c08094c0fe204a756a Mon Sep 17 00:00:00 2001 From: batzor <32958247+batzor@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:49:34 +0900 Subject: [PATCH 2/2] build: add openmp flags to goldilocks --- third_party/goldilocks/goldilocks.BUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/third_party/goldilocks/goldilocks.BUILD b/third_party/goldilocks/goldilocks.BUILD index c62eea8403..888d551dc1 100644 --- a/third_party/goldilocks/goldilocks.BUILD +++ b/third_party/goldilocks/goldilocks.BUILD @@ -1,4 +1,5 @@ load("@kroma_network_tachyon//bazel:tachyon.bzl", "if_has_avx512") +load("@kroma_network_tachyon//bazel:tachyon_cc.bzl", "tachyon_openmp_copts", "tachyon_openmp_linkopts") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -19,7 +20,8 @@ cc_library( copts = if_has_avx512( ["-mavx512f"], ["-mavx2"], - ), + ) + tachyon_openmp_copts(), + linkopts = tachyon_openmp_linkopts(), defines = if_has_avx512(["__AVX512__"]), include_prefix = "third_party/goldilocks/include", includes = ["src"],