Skip to content

Commit

Permalink
fix uwp build (#5328)
Browse files Browse the repository at this point in the history
  • Loading branch information
nihui authored Feb 2, 2024
1 parent d38bdbd commit 5b536af
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions src/cpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,13 @@ static bool is_being_debugged()
}

#if defined _WIN32
#if WINAPI_FAMILY == WINAPI_FAMILY_APP
static int detectisa(const void* /*some_inst*/)
{
// uwp does not support seh :(
return 0;
}
#else // WINAPI_FAMILY == WINAPI_FAMILY_APP
static int g_sigill_caught = 0;
static jmp_buf g_jmpbuf;

Expand Down Expand Up @@ -275,6 +282,7 @@ static int detectisa(const void* some_inst)

return g_sigill_caught ? 0 : 1;
}
#endif // WINAPI_FAMILY == WINAPI_FAMILY_APP

#if defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64)
#ifdef _MSC_VER
Expand Down Expand Up @@ -2033,12 +2041,12 @@ static void initialize_global_cpu_info()

#if defined _WIN32
#if __arm__
g_cpu_support_arm_neon = detectisa(some_neon);
g_cpu_support_arm_neon = 1; // all modern windows arm devices have neon
g_cpu_support_arm_vfpv4 = detectisa(some_vfpv4);
#if __aarch64__
g_cpu_support_arm_cpuid = detectisa(some_cpuid);
g_cpu_support_arm_asimdhp = detectisa(some_asimdhp);
g_cpu_support_arm_asimddp = detectisa(some_asimddp);
g_cpu_support_arm_asimdhp = detectisa(some_asimdhp) || IsProcessorFeaturePresent(43); // dp implies hp
g_cpu_support_arm_asimddp = detectisa(some_asimddp) || IsProcessorFeaturePresent(43); // 43 is PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE
g_cpu_support_arm_asimdfhm = detectisa(some_asimdfhm);
g_cpu_support_arm_bf16 = detectisa(some_bf16);
g_cpu_support_arm_i8mm = detectisa(some_i8mm);
Expand Down

0 comments on commit 5b536af

Please sign in to comment.