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
|
Index: icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
===================================================================
--- icedtea6-1.8.orig/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200
+++ icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200
@@ -32,6 +32,96 @@
#if SHARK_LLVM_VERSION >= 27
namespace {
+
+#if defined(__arm__) && defined(__linux__)
+#include <fcntl.h>
+#include <linux/auxvec.h>
+#include <asm/hwcap.h>
+#define VECBUFF_SIZE 32
+
+bool TestARMLinuxHWCAP(int feature) {
+ int fd;
+ unsigned vecs[VECBUFF_SIZE];
+ unsigned *p;
+ int i, n;
+ int rc;
+
+ rc = 0;
+ fd = open("/proc/self/auxv", O_RDONLY);
+ if (fd < 0) return 0;
+ do {
+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
+ p = vecs;
+ i = n/8;
+ while (--i >=0) {
+ unsigned tag = *p++;
+ unsigned value = *p++;
+ if (tag == 0) goto fini;
+ if(tag == AT_HWCAP && (value & feature)) {
+ rc = 1;
+ goto fini;
+ }
+ }
+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
+fini:
+ close(fd);
+ return rc;
+}
+
+char* TestARMLinuxAT(int auxvec) {
+ int fd;
+ unsigned vecs[VECBUFF_SIZE];
+ unsigned *p;
+ int i, n;
+ char* rc;
+
+ rc = 0;
+ fd = open("/proc/self/auxv", O_RDONLY);
+ if (fd < 0) return 0;
+ do {
+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
+ p = vecs;
+ i = n/8;
+ while (--i >=0) {
+ unsigned tag = *p++;
+ unsigned value = *p++;
+ if (tag == 0) goto fini;
+ if(tag == (unsigned) auxvec ) {
+ rc = (char*)value;
+ goto fini;
+ }
+ }
+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
+fini:
+ close(fd);
+ return rc;
+}
+
+bool getARMHostCPUFeatures(StringMap<bool> &Features) {
+ // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON);
+ Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE);
+ Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP);
+
+ std::string testArchKey(TestARMLinuxAT(AT_PLATFORM));
+
+ StringMap<std::string> archLinuxToLLVMMap;
+ archLinuxToLLVMMap["v4l"]="v4t";
+ archLinuxToLLVMMap["v5l"]="v5t";
+ archLinuxToLLVMMap["v6l"]="v6";
+ // FIXME change this from v6 to v7a when LLVM PR6265 have been fixed
+ archLinuxToLLVMMap["v7l"]="v6";
+
+ llvm::StringMapIterator<std::string> resultIterator(archLinuxToLLVMMap.find(
+ testArchKey));
+ if(resultIterator->first()) {
+ std::string arch(resultIterator->second);
+ Features[arch]=true;
+ }
+
+ return true;
+}
+#endif
+
cl::opt<std::string>
MCPU("mcpu");
@@ -64,7 +154,11 @@
#if SHARK_LLVM_VERSION >= 27
// Finetune LLVM for the current host CPU.
StringMap<bool> Features;
+#if defined(__arm__) && defined(__linux__)
+ bool gotCpuFeatures = getARMHostCPUFeatures(Features);
+#else
bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features);
+#endif
std::string cpu("-mcpu=" + llvm::sys::getHostCPUName());
std::vector<const char*> args;
|
