Skip to content

Commit 112b7ea

Browse files
author
DvirDukhan
authored
fix build for x86 and arm (#110)
* fix the right define * fixed the include * removed cpu_features macros include * incdlue cpu_features macros * fixed x86 build
1 parent b4dfb45 commit 112b7ea

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/VecSim/spaces/space_aux.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#include "space_aux.h"
2+
#include "cpu_features_macros.h"
3+
4+
#ifdef CPU_FEATURES_ARCH_X86_64
5+
#include "cpuinfo_x86.h"
6+
#endif // CPU_FEATURES_ARCH_X86_64
27

38
Arch_Optimization getArchitectureOptimization() {
49

5-
#ifdef CPU_FEATURES_ARCH_X86
10+
#ifdef CPU_FEATURES_ARCH_X86_64
611
#include "cpuinfo_x86.h"
712
cpu_features::X86Features features = cpu_features::GetX86Info().features;
813
if (features.avx512f) {
@@ -13,7 +18,7 @@ Arch_Optimization getArchitectureOptimization() {
1318
features.sse4_2 || features.sse4a) {
1419
return ARCH_OPT_SSE;
1520
}
16-
#endif // CPU_FEATURES_ARCH_X86
21+
#endif // CPU_FEATURES_ARCH_X86_64
1722

1823
return ARCH_OPT_NONE;
1924
}

tests/unit/test_spaces.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "gtest/gtest.h"
2+
#include "cpu_features_macros.h"
23
#include "VecSim/spaces/space_aux.h"
34
#include "VecSim/spaces/IP/IP.h"
45
#include "VecSim/spaces/IP/IP_SSE.h"
@@ -21,7 +22,7 @@ class SpacesTest : public ::testing::Test {
2122
void TearDown() override {}
2223
};
2324

24-
#ifdef CPU_FEATURES_ARCH_X86
25+
#ifdef CPU_FEATURES_ARCH_X86_64
2526
// This test will trigger the "Residuals" function for dimension > 16, for each optimization.
2627
TEST_F(SpacesTest, l2_17) {
2728
Arch_Optimization optimization = getArchitectureOptimization();
@@ -121,4 +122,4 @@ TEST_F(SpacesTest, ip_9) {
121122
ASSERT_TRUE(false);
122123
}
123124
}
124-
#endif // CPU_FEATURES_ARCH_X86
125+
#endif // CPU_FEATURES_ARCH_X86_64

0 commit comments

Comments
 (0)