-
Notifications
You must be signed in to change notification settings - Fork 11
/
Copy pathtblis_diff
120 lines (107 loc) · 4.15 KB
/
tblis_diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
diff --git a/src/external/marray/include/expression.hpp b/src/external/marray/include/expression.hpp
index 2448c61..f7742a4 100644
--- a/src/external/marray/include/expression.hpp
+++ b/src/external/marray/include/expression.hpp
@@ -1,7 +1,7 @@
#ifndef _MARRAY_EXPRESSION_HPP_
#define _MARRAY_EXPRESSION_HPP_
-#include <x86intrin.h>
+//#include <x86intrin.h>
#include "utility.hpp"
#include "vector.hpp"
diff --git a/src/external/marray/include/vector_avx.hpp b/src/external/marray/include/vector_avx.hpp
index a37e9d0..a8c77f5 100644
--- a/src/external/marray/include/vector_avx.hpp
+++ b/src/external/marray/include/vector_avx.hpp
@@ -1,7 +1,7 @@
#ifndef _MARRAY_VECTOR_AVX_HPP_
#define _MARRAY_VECTOR_AVX_HPP_
-#include <x86intrin.h>
+//#include <x86intrin.h>
#include "vector.hpp"
namespace MArray
diff --git a/src/external/marray/include/vector_avx512.hpp b/src/external/marray/include/vector_avx512.hpp
index f493cdd..db02eef 100644
--- a/src/external/marray/include/vector_avx512.hpp
+++ b/src/external/marray/include/vector_avx512.hpp
@@ -1,7 +1,7 @@
#ifndef _MARRAY_VECTOR_AVX512_HPP_
#define _MARRAY_VECTOR_AVX512_HPP_
-#include <x86intrin.h>
+//#include <x86intrin.h>
#include "vector.hpp"
namespace MArray
diff --git a/src/external/marray/include/vector_sse41.hpp b/src/external/marray/include/vector_sse41.hpp
index e28b849..4c52b71 100644
--- a/src/external/marray/include/vector_sse41.hpp
+++ b/src/external/marray/include/vector_sse41.hpp
@@ -1,7 +1,7 @@
#ifndef _MARRAY_VECTOR_SSE41_HPP_
#define _MARRAY_VECTOR_SSE41_HPP_
-#include <x86intrin.h>
+//#include <x86intrin.h>
#include "vector.hpp"
namespace MArray
diff --git a/src/util/cpuid.cxx b/src/util/cpuid.cxx
index 6cb19b6..6b44a1d 100644
--- a/src/util/cpuid.cxx
+++ b/src/util/cpuid.cxx
@@ -246,7 +246,7 @@ int get_cpu_type(int& model, int& part, int& features)
auto pos = ptno.find("0x");
TBLIS_ASSERT(pos != std::string::npos);
- part = strtoi(ptno, pos, 16);
+ part = std::stoi(ptno, &pos, 16);
return VENDOR_ARM;
}
diff --git a/src/util/cpuid.hpp b/src/util/cpuid.hpp
index 320803d..f6be8bc 100644
--- a/src/util/cpuid.hpp
+++ b/src/util/cpuid.hpp
@@ -42,8 +42,8 @@ int get_cpu_type(int& family, int& model, int& features);
namespace tblis
{
-enum {VENDOR_ARM, VENDOR_UNKNOWN}
-enum {MODEL_ARMV7, MODEL_ARMV8, MODEL_UNKNOWN}
+enum {VENDOR_ARM, VENDOR_UNKNOWN};
+enum {MODEL_ARMV7, MODEL_ARMV8, MODEL_UNKNOWN};
enum {FEATURE_NEON = 0x1};
int get_cpu_type(int& model, int& part, int& features);
diff --git a/config.sub b/config.sub
index 8b612ab..c752cc1 100755
--- a/config.sub
+++ b/config.sub
@@ -367,7 +367,7 @@ case $basic_machine in
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
diff --git a/src/external/marray/config.sub b/src/external/marray/config.sub
index 7ffe373..dafb01c 100755
--- a/src/external/marray/config.sub
+++ b/src/external/marray/config.sub
@@ -374,7 +374,7 @@ case $basic_machine in
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
diff --git a/src/external/tci/config.sub b/src/external/tci/config.sub
index 8b612ab..c752cc1 100755
--- a/src/external/tci/config.sub
+++ b/src/external/tci/config.sub
@@ -367,7 +367,7 @@ case $basic_machine in
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \