Skip to content

[libc] Correct x86_64 architecture for string(s) tests. #143150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2025
Merged

[libc] Correct x86_64 architecture for string(s) tests. #143150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libc/src/string/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions libc/src/strings/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion libc/test/utils/FPUtil/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading