From 891a0abfc2e619400065aee471169c01ca7ebf25 Mon Sep 17 00:00:00 2001 From: lntue Date: Fri, 6 Jun 2025 11:18:55 -0400 Subject: [PATCH] [libc] Correct x86_64 architecture for string(s) tests. (#143150) --- libc/src/string/CMakeLists.txt | 8 ++++---- libc/src/strings/CMakeLists.txt | 4 ++-- libc/test/utils/FPUtil/CMakeLists.txt | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt index 2c607bf8ea89..2ee6d6bf950a 100644 --- a/libc/src/string/CMakeLists.txt +++ b/libc/src/string/CMakeLists.txt @@ -442,7 +442,7 @@ function(add_memcmp memcmp_name) ) endfunction() -if(${LIBC_TARGET_ARCHITECTURE_IS_X86}) +if(${LIBC_TARGET_ARCHITECTURE_IS_X86_64}) add_memcmp(memcmp_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2) add_memcmp(memcmp_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2) add_memcmp(memcmp_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2) @@ -474,7 +474,7 @@ function(add_memcpy memcpy_name) ) endfunction() -if(${LIBC_TARGET_ARCHITECTURE_IS_X86}) +if(${LIBC_TARGET_ARCHITECTURE_IS_X86_64}) add_memcpy(memcpy_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2) add_memcpy(memcpy_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2) add_memcpy(memcpy_x86_64_opt_avx COMPILE_OPTIONS -march=sandybridge REQUIRE AVX) @@ -510,7 +510,7 @@ function(add_memmove memmove_name) ) endfunction() -if(${LIBC_TARGET_ARCHITECTURE_IS_X86}) +if(${LIBC_TARGET_ARCHITECTURE_IS_X86_64}) add_memmove(memmove_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2) add_memmove(memmove_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2) add_memmove(memmove_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2) @@ -544,7 +544,7 @@ function(add_memset memset_name) ) endfunction() -if(${LIBC_TARGET_ARCHITECTURE_IS_X86}) +if(${LIBC_TARGET_ARCHITECTURE_IS_X86_64}) add_memset(memset_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2) add_memset(memset_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2) add_memset(memset_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2) diff --git a/libc/src/strings/CMakeLists.txt b/libc/src/strings/CMakeLists.txt index d312495ae8d9..ea1c932be048 100644 --- a/libc/src/strings/CMakeLists.txt +++ b/libc/src/strings/CMakeLists.txt @@ -8,7 +8,7 @@ function(add_bcmp bcmp_name) ) endfunction() -if(${LIBC_TARGET_ARCHITECTURE_IS_X86}) +if(${LIBC_TARGET_ARCHITECTURE_IS_X86_64}) add_bcmp(bcmp_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2) add_bcmp(bcmp_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2) add_bcmp(bcmp_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2) @@ -32,7 +32,7 @@ function(add_bzero bzero_name) ) endfunction() -if(${LIBC_TARGET_ARCHITECTURE_IS_X86}) +if(${LIBC_TARGET_ARCHITECTURE_IS_X86_64}) add_bzero(bzero_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2) add_bzero(bzero_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2) add_bzero(bzero_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2) diff --git a/libc/test/utils/FPUtil/CMakeLists.txt b/libc/test/utils/FPUtil/CMakeLists.txt index 7b6c294506b1..c4ade937d09a 100644 --- a/libc/test/utils/FPUtil/CMakeLists.txt +++ b/libc/test/utils/FPUtil/CMakeLists.txt @@ -1,4 +1,5 @@ -if((${LIBC_TARGET_OS} STREQUAL "linux") AND (${LIBC_TARGET_ARCHITECTURE_IS_X86})) +if((${LIBC_TARGET_OS} STREQUAL "linux") AND ((${LIBC_TARGET_ARCHITECTURE_IS_X86}) + OR (${LIBC_TARGET_ARCHITECTURE_IS_X86_64}))) add_libc_unittest( x86_long_double_test SRCS