From 1b06d64d88c5fc52ceff3095e4e3eac1dcea0e73 Mon Sep 17 00:00:00 2001 From: Matt Bolitho Date: Fri, 30 Aug 2024 20:54:10 +0100 Subject: [PATCH 1/3] [CMake] Suppresses ml64 printing --- llvm/lib/Support/BLAKE3/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Support/BLAKE3/CMakeLists.txt b/llvm/lib/Support/BLAKE3/CMakeLists.txt index 51317b8048f76..7e5352208ddcb 100644 --- a/llvm/lib/Support/BLAKE3/CMakeLists.txt +++ b/llvm/lib/Support/BLAKE3/CMakeLists.txt @@ -28,12 +28,18 @@ if (CAN_USE_ASSEMBLER) check_symbol_exists(_M_X64 "" IS_X64) if (IS_X64) enable_language(ASM_MASM) - list(APPEND LLVM_BLAKE3_FILES + set(LLVM_BLAKE3_ASM_FILES blake3_sse2_x86-64_windows_msvc.asm blake3_sse41_x86-64_windows_msvc.asm blake3_avx2_x86-64_windows_msvc.asm blake3_avx512_x86-64_windows_msvc.asm ) + list(APPEND LLVM_BLAKE3_FILES ${LLVM_BLAKE3_ASM_FILES}) + # Supress the copyright message and 'Assembling...' message. + foreach(LLVM_BLAKE3_ASM_FILE ${LLVM_BLAKE3_ASM_FILES}) + set_source_files_properties(${LLVM_BLAKE3_ASM_FILE} + PROPERTIES COMPILE_OPTIONS "/quiet;/nologo") + endforeach() else() disable_blake3_x86_simd() endif() From a2ec809bcf13d5a53a06a9976bf7390e642cffbe Mon Sep 17 00:00:00 2001 From: Matt Bolitho Date: Fri, 30 Aug 2024 22:42:44 +0100 Subject: [PATCH 2/3] Uses /nologo only --- llvm/lib/Support/BLAKE3/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/lib/Support/BLAKE3/CMakeLists.txt b/llvm/lib/Support/BLAKE3/CMakeLists.txt index 7e5352208ddcb..6cb7eb4b8d85e 100644 --- a/llvm/lib/Support/BLAKE3/CMakeLists.txt +++ b/llvm/lib/Support/BLAKE3/CMakeLists.txt @@ -38,7 +38,7 @@ if (CAN_USE_ASSEMBLER) # Supress the copyright message and 'Assembling...' message. foreach(LLVM_BLAKE3_ASM_FILE ${LLVM_BLAKE3_ASM_FILES}) set_source_files_properties(${LLVM_BLAKE3_ASM_FILE} - PROPERTIES COMPILE_OPTIONS "/quiet;/nologo") + PROPERTIES COMPILE_OPTIONS "/nologo") endforeach() else() disable_blake3_x86_simd() From 6e7c96837cdcd78dafd03a642954141d20fe5998 Mon Sep 17 00:00:00 2001 From: Matt Bolitho Date: Sat, 31 Aug 2024 23:34:10 +0100 Subject: [PATCH 3/3] Removes foreach and adjusts comment --- llvm/lib/Support/BLAKE3/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Support/BLAKE3/CMakeLists.txt b/llvm/lib/Support/BLAKE3/CMakeLists.txt index 6cb7eb4b8d85e..99cb78881ec47 100644 --- a/llvm/lib/Support/BLAKE3/CMakeLists.txt +++ b/llvm/lib/Support/BLAKE3/CMakeLists.txt @@ -35,11 +35,9 @@ if (CAN_USE_ASSEMBLER) blake3_avx512_x86-64_windows_msvc.asm ) list(APPEND LLVM_BLAKE3_FILES ${LLVM_BLAKE3_ASM_FILES}) - # Supress the copyright message and 'Assembling...' message. - foreach(LLVM_BLAKE3_ASM_FILE ${LLVM_BLAKE3_ASM_FILES}) - set_source_files_properties(${LLVM_BLAKE3_ASM_FILE} - PROPERTIES COMPILE_OPTIONS "/nologo") - endforeach() + # Supress the copyright message. + set_source_files_properties(${LLVM_BLAKE3_ASM_FILES} + PROPERTIES COMPILE_OPTIONS "/nologo") else() disable_blake3_x86_simd() endif()