Skip to content

Fix Windows ARM64 debug flags #6

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

Open
volkermauel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Windows ARM64 debug flags #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8609dea
Disable CodeView debug format for Windows ARM64
volkermauel Aug 1, 2025
8e105a5
Fix ARM64 cross build flags
volkermauel Aug 2, 2025
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
cmake_minimum_required(VERSION 3.14) # for add_link_options and implicit target directories.

# Ensure CMAKE_MSVC_DEBUG_INFORMATION_FORMAT is honored
if(POLICY CMP0141)
cmake_policy(SET CMP0141 NEW)
endif()
project("llama.cpp" C CXX)
include(CheckIncludeFileCXX)

Expand Down
19 changes: 17 additions & 2 deletions cmake/arm64-windows-llvm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,20 @@ set( CMAKE_CXX_COMPILER_TARGET ${target} )
set( arch_c_flags "-march=armv8.7-a -Xclang -target-feature -Xclang +fullfp16 -fvectorize -ffp-model=fast -fno-finite-math-only" )
set( warn_c_flags "-Wno-format -Wno-unused-variable -Wno-unused-function -Wno-gnu-zero-variadic-macro-arguments" )

set( CMAKE_C_FLAGS_INIT "${arch_c_flags} ${warn_c_flags}" )
set( CMAKE_CXX_FLAGS_INIT "${arch_c_flags} ${warn_c_flags}" )
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "")
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT "")

set(base_flags "${arch_c_flags} ${warn_c_flags}")
set(debug_flags "-g -gdwarf-4")

set(CMAKE_C_FLAGS_INIT "${base_flags}")
set(CMAKE_CXX_FLAGS_INIT "${base_flags}")

set(CMAKE_C_FLAGS_DEBUG_INIT "${debug_flags}")
set(CMAKE_CXX_FLAGS_DEBUG_INIT "${debug_flags}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -DNDEBUG ${debug_flags}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -DNDEBUG ${debug_flags}")
set(CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
16 changes: 14 additions & 2 deletions examples/quantize-stats/quantize-stats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,29 @@
#include <array>
#include <random>

#if defined(_MSC_VER)
#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
#pragma warning(disable: 4244 4267) // possible loss of data
#include <intrin.h>
#include <ammintrin.h>
#include <nmmintrin.h>
#include <immintrin.h>
#include <stdlib.h>
inline int popcount(uint8_t x) { return __popcnt(x); }
inline int popcount(uint8_t x) { return __popcnt(x); }
inline int popcount(uint16_t x) { return __popcnt(x); }
inline int popcount(uint32_t x) { return __popcnt(x); }
inline int popcount(uint64_t x) { return _mm_popcnt_u64(x); }
#elif defined(_MSC_VER)
#include <stdlib.h>
inline int popcount(uint8_t x) { return __builtin_popcount(x); }
inline int popcount(uint16_t x) { return __builtin_popcount(x); }
inline int popcount(uint32_t x) { return __builtin_popcount(x); }
inline int popcount(uint64_t x) { return __builtin_popcountll(x); }
#else
inline int popcount(uint8_t x) { return __builtin_popcount(x); }
inline int popcount(uint16_t x) { return __builtin_popcount(x); }
inline int popcount(uint32_t x) { return __builtin_popcount(x); }
inline int popcount(uint64_t x) { return __builtin_popcountll(x); }
#endif
#else
constexpr int popcount(uint8_t x) { return __builtin_popcount(x); }
constexpr int popcount(uint16_t x) { return __builtin_popcount(x); }
Expand Down
2 changes: 1 addition & 1 deletion ggml/src/ggml-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ static inline ggml_fp16_t ggml_compute_fp32_to_fp16(float f) {
#include <intrin.h>
#else
#if defined(__AVX__) || defined(__AVX2__) || defined(__AVX512F__) || defined(__SSSE3__) || defined(__SSE3__) || defined(__SSE__)
#if !defined(__riscv)
#if !defined(__riscv) && !defined(__aarch64__)
#include <immintrin.h>
#endif
#endif
Expand Down
10 changes: 8 additions & 2 deletions ggml/src/iqk/iqk_quantize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,23 @@
#include <unordered_map>
#include <string>

#if defined(_MSC_VER)
#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
#pragma warning(disable: 4244 4267) // possible loss of data
#include <intrin.h>
#include <ammintrin.h>
#include <nmmintrin.h>
#include <immintrin.h>
#include <stdlib.h>
inline int popcount(uint8_t x) { return __popcnt(x); }
inline int popcount(uint8_t x) { return __popcnt(x); }
inline int popcount(uint16_t x) { return __popcnt(x); }
inline int popcount(uint32_t x) { return __popcnt(x); }
inline int popcount(uint64_t x) { return _mm_popcnt_u64(x); }
#elif defined(_MSC_VER)
#include <stdlib.h>
inline int popcount(uint8_t x) { return __builtin_popcount(x); }
inline int popcount(uint16_t x) { return __builtin_popcount(x); }
inline int popcount(uint32_t x) { return __builtin_popcount(x); }
inline int popcount(uint64_t x) { return __builtin_popcountll(x); }
#else
constexpr int popcount(uint8_t x) { return __builtin_popcount(x); }
constexpr int popcount(uint16_t x) { return __builtin_popcount(x); }
Expand Down
Loading