No public description PiperOrigin-RevId: 702725197 Change-Id: I935f71114ce0e6aef686e55086aa30b69e1680e6
diff --git a/riscv/BUILD b/riscv/BUILD index 09b022a..fd00819 100644 --- a/riscv/BUILD +++ b/riscv/BUILD
@@ -48,13 +48,13 @@ ) config_setting( - name = "darwin_arm64_cpu", - values = {"cpu": "darwin_arm64"}, + name = "aarch64", + values = {"cpu": "aarch64"}, ) config_setting( - name = "aarch64", - values = {"cpu": "aarch64"}, + name = "darwin_arm64_cpu", + values = {"cpu": "darwin_arm64"}, ) cc_library( @@ -106,25 +106,39 @@ cc_library( name = "riscv_fp_state", - srcs = [ - "riscv_fp_state.cc", - ] + select({ - "arm_cpu": ["riscv_fp_host_arm.cc"], - "aarch64": ["riscv_fp_host_arm.cc"], - "darwin_arm64_cpu": ["riscv_fp_host_arm.cc"], - "//conditions:default": ["riscv_fp_host_x86.cc"], + srcs = select({ + "arm_cpu": [ + "riscv_fp_host_arm.cc", + "riscv_fp_state.cc", + ], + "aarch64": [ + "riscv_fp_host_arm.cc", + "riscv_fp_state.cc", + ], + "darwin_arm64_cpu": [ + "riscv_fp_host_arm.cc", + "riscv_fp_state.cc", + ], + "//conditions:default": [ + "riscv_fp_host_x86.cc", + "riscv_fp_state.cc", + ], }), hdrs = [ "riscv_fp_host.h", "riscv_fp_info.h", "riscv_fp_state.h", ], - copts = [ - "-O3", - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": [ + "-O3", + "-ffp-model=strict", + ], + "//conditions:default": [ + "-O3", + "-ffp-model=strict", + "-fprotect-parens", + ], }), deps = [ ":riscv_state", @@ -158,12 +172,16 @@ "riscv_zicond_instructions.h", "riscv_zicsr_instructions.h", ], - copts = [ - "-O3", - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": [ + "-O3", + "-ffp-model=strict", + ], + "//conditions:default": [ + "-O3", + "-ffp-model=strict", + "-fprotect-parens", + ], }), deps = [ ":riscv_fp_state", @@ -231,12 +249,16 @@ "riscv_vector_reduction_instructions.h", "riscv_vector_unary_instructions.h", ], - copts = [ - "-O3", - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": [ + "-O3", + "-ffp-model=strict", + ], + "//conditions:default": [ + "-O3", + "-ffp-model=strict", + "-fprotect-parens", + ], }), deps = [ ":riscv_fp_state",
diff --git a/riscv/test/BUILD b/riscv/test/BUILD index 19ca1cc..82910b6 100644 --- a/riscv/test/BUILD +++ b/riscv/test/BUILD
@@ -16,11 +16,6 @@ package(default_applicable_licenses = ["//:license"]) -config_setting( - name = "darwin_arm64_cpu", - values = {"cpu": "darwin_arm64"}, -) - cc_library( name = "riscv_vector_instructions_test_base", testonly = True, @@ -169,11 +164,12 @@ name = "riscv_d_instructions_test", size = "small", srcs = ["riscv_d_instructions_test.cc"], - copts = [ - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": ["-ffp-model=strict"], + "//conditions:default": [ + "-ffp-model=strict", + "-fprotect-parens", + ], }), tags = ["not_run:arm"], deps = [ @@ -190,11 +186,12 @@ name = "riscv_f_instructions_test", size = "small", srcs = ["riscv_f_instructions_test.cc"], - copts = [ - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": ["-ffp-model=strict"], + "//conditions:default": [ + "-ffp-model=strict", + "-fprotect-parens", + ], }), tags = ["not_run:arm"], deps = [ @@ -546,11 +543,12 @@ srcs = [ "riscv_vector_fp_unary_instructions_test.cc", ], - copts = [ - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": ["-ffp-model=strict"], + "//conditions:default": [ + "-ffp-model=strict", + "-fprotect-parens", + ], }), deps = [ ":riscv_vector_fp_test_utilities", @@ -574,11 +572,12 @@ srcs = [ "riscv_vector_fp_instructions_test.cc", ], - copts = [ - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": ["-ffp-model=strict"], + "//conditions:default": [ + "-ffp-model=strict", + "-fprotect-parens", + ], }), deps = [ ":riscv_vector_fp_test_utilities", @@ -602,11 +601,12 @@ srcs = [ "riscv_vector_fp_compare_instructions_test.cc", ], - copts = [ - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": ["-ffp-model=strict"], + "//conditions:default": [ + "-ffp-model=strict", + "-fprotect-parens", + ], }), deps = [ ":riscv_vector_fp_test_utilities", @@ -628,11 +628,12 @@ srcs = [ "riscv_vector_fp_reduction_instructions_test.cc", ], - copts = [ - "-ffp-model=strict", - ] + select({ - "darwin_arm64_cpu": [], - "//conditions:default": ["-fprotect-parens"], + copts = select({ + "darwin_arm64_cpu": ["-ffp-model=strict"], + "//conditions:default": [ + "-ffp-model=strict", + "-fprotect-parens", + ], }), deps = [ ":riscv_vector_fp_test_utilities", @@ -874,3 +875,18 @@ "@com_google_mpact-sim//mpact/sim/util/memory", ], ) + +config_setting( + name = "arm_cpu", + values = {"cpu": "arm"}, +) + +config_setting( + name = "aarch64", + values = {"cpu": "aarch64"}, +) + +config_setting( + name = "darwin_arm64_cpu", + values = {"cpu": "darwin_arm64"}, +)