comparison mx.graal/suite.py @ 23226:951f005de2cd

removed JVMCI library
author Doug Simon <doug.simon@oracle.com>
date Thu, 31 Dec 2015 15:37:16 +0100
parents 2375d87e535d
children 77feea4fe00c
comparison
equal deleted inserted replaced
23225:2375d87e535d 23226:951f005de2cd
1 import mx 1 import mx
2 JDK9 = mx.get_jdk(tag='default').javaCompliance >= "1.9" 2 JDK9 = mx.get_jdk(tag='default').javaCompliance >= "1.9"
3 3
4 def deps(l): 4 def deps(l):
5 """ 5 """ Filters out dependencies starting with 'jvmci:' if using JDK9. """
6 If using JDK9, replaces dependencies starting with 'jvmci:' with 'JVMCI'. 6 return [d for d in l if not JDK9 or not d.startswith("jvmci:")]
7 Otherwise, excludes "JVMCI".
8 """
9 if JDK9:
10 res = []
11 for e in l:
12 if e.startswith("jvmci:"):
13 if not "JVMCI" in res:
14 res.append("JVMCI")
15 else:
16 res.append(e)
17 return res
18 else:
19 return [d for d in l if d != "JVMCI"]
20
21 def libs(d):
22 """
23 If not using JDK9, excludes "JVMCI" library.
24 """
25 if not JDK9:
26 del d["JVMCI"]
27 return d
28 7
29 def suites(l): 8 def suites(l):
30 """ Filters out suites named 'jvmci' if using JDK9. """ 9 """ Filters out suites named 'jvmci' if using JDK9. """
31 return [s for s in l if not JDK9 or not s.get('name') == "jvmci"] 10 return [s for s in l if not JDK9 or not s.get('name') == "jvmci"]
32 11
56 ]) 35 ])
57 }, 36 },
58 37
59 "defaultLicense" : "GPLv2-CPE", 38 "defaultLicense" : "GPLv2-CPE",
60 39
61 "libraries" : libs({ 40 "libraries" : {
62 41
63 # ------------- Libraries ------------- 42 # ------------- Libraries -------------
64 43
65 "DACAPO" : { 44 "DACAPO" : {
66 "urls" : [ 45 "urls" : [
88 "sha1" : "7e1577cf6e1f1326b78a322d206fa9412fd41ae9", 67 "sha1" : "7e1577cf6e1f1326b78a322d206fa9412fd41ae9",
89 "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/jmh/jmh-runner-1.11.2.jar"], 68 "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/jmh/jmh-runner-1.11.2.jar"],
90 "sourceSha1" : "12a67f0dcdfe7e43218bf38c1d7fd766122a3dc7", 69 "sourceSha1" : "12a67f0dcdfe7e43218bf38c1d7fd766122a3dc7",
91 "sourceUrls" : ["https://lafo.ssw.uni-linz.ac.at/pub/jmh/jmh-runner-1.11.2-sources.jar"], 70 "sourceUrls" : ["https://lafo.ssw.uni-linz.ac.at/pub/jmh/jmh-runner-1.11.2-sources.jar"],
92 }, 71 },
93 72 },
94 # Library that allows Graal to compile against JVMCI without the jvmci suite.
95 # This library is not added to the boot class path at run time and so code
96 # compiled against this library must be run on (a JVMCI enabled) JDK9.
97 "JVMCI" : {
98 "sha1" : "c9d62b2b7408592cd8805aa1cdb2f01189b81dff",
99 "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/jvmci-5ecfc0f99fed.jar"],
100 "sourceSha1" : "ef74ca52fa2d09ab3dfc210e8be6c87ef02f4693",
101 "sourceUrls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/jvmci-5ecfc0f99fed.src.zip"],
102 "license": "GPLv2-CPE",
103 },
104 }),
105 73
106 "projects" : { 74 "projects" : {
107 75
108 # ------------- NFI ------------- 76 # ------------- NFI -------------
109 77
160 "dependencies" : [ 128 "dependencies" : [
161 "com.oracle.graal.options", 129 "com.oracle.graal.options",
162 ], 130 ],
163 "checkstyle" : "com.oracle.graal.graph", 131 "checkstyle" : "com.oracle.graal.graph",
164 "javaCompliance" : "1.8", 132 "javaCompliance" : "1.8",
165 "workingSets" : "JVMCI,Codegen", 133 "workingSets" : "Graal,Codegen",
166 }, 134 },
167 135
168 "com.oracle.graal.options.test" : { 136 "com.oracle.graal.options.test" : {
169 "subDir" : "graal", 137 "subDir" : "graal",
170 "sourceDirs" : ["src"], 138 "sourceDirs" : ["src"],
172 "com.oracle.graal.options", 140 "com.oracle.graal.options",
173 "mx:JUNIT", 141 "mx:JUNIT",
174 ], 142 ],
175 "checkstyle" : "com.oracle.graal.graph", 143 "checkstyle" : "com.oracle.graal.graph",
176 "javaCompliance" : "1.8", 144 "javaCompliance" : "1.8",
177 "workingSets" : "JVMCI", 145 "workingSets" : "Graal",
178 }, 146 },
179 147
180 "com.oracle.graal.debug" : { 148 "com.oracle.graal.debug" : {
181 "subDir" : "graal", 149 "subDir" : "graal",
182 "sourceDirs" : ["src"], 150 "sourceDirs" : ["src"],
1168 "dependencies" : [ 1136 "dependencies" : [
1169 "com.oracle.graal.api.replacements", 1137 "com.oracle.graal.api.replacements",
1170 "com.oracle.graal.api.runtime", 1138 "com.oracle.graal.api.runtime",
1171 "com.oracle.graal.graph", 1139 "com.oracle.graal.graph",
1172 ], 1140 ],
1173 "exclude" : deps(["JVMCI"]),
1174 "distDependencies" : deps([ 1141 "distDependencies" : deps([
1175 "jvmci:JVMCI_API", 1142 "jvmci:JVMCI_API",
1176 "GRAAL_NODEINFO", 1143 "GRAAL_NODEINFO",
1177 "GRAAL_OPTIONS", 1144 "GRAAL_OPTIONS",
1178 ]), 1145 ]),
1181 "GRAAL_COMPILER" : { 1148 "GRAAL_COMPILER" : {
1182 "subDir" : "graal", 1149 "subDir" : "graal",
1183 "dependencies" : [ 1150 "dependencies" : [
1184 "com.oracle.graal.compiler", 1151 "com.oracle.graal.compiler",
1185 ], 1152 ],
1186 "exclude" : deps(["JVMCI"]),
1187 "distDependencies" : [ 1153 "distDependencies" : [
1188 "GRAAL_API", 1154 "GRAAL_API",
1189 "GRAAL_SERVICEPROVIDER", 1155 "GRAAL_SERVICEPROVIDER",
1190 ], 1156 ],
1191 }, 1157 },
1203 "com.oracle.graal.replacements.amd64", 1169 "com.oracle.graal.replacements.amd64",
1204 "com.oracle.graal.compiler.sparc", 1170 "com.oracle.graal.compiler.sparc",
1205 "com.oracle.graal.replacements.sparc", 1171 "com.oracle.graal.replacements.sparc",
1206 "com.oracle.graal.salver", 1172 "com.oracle.graal.salver",
1207 ], 1173 ],
1208 "exclude" : deps(["JVMCI"]),
1209 "distDependencies" : [ 1174 "distDependencies" : [
1210 "GRAAL_API", 1175 "GRAAL_API",
1211 "GRAAL_COMPILER", 1176 "GRAAL_COMPILER",
1212 ], 1177 ],
1213 }, 1178 },
1218 "com.oracle.graal.hotspot.aarch64", 1183 "com.oracle.graal.hotspot.aarch64",
1219 "com.oracle.graal.hotspot.amd64", 1184 "com.oracle.graal.hotspot.amd64",
1220 "com.oracle.graal.hotspot.sparc", 1185 "com.oracle.graal.hotspot.sparc",
1221 "com.oracle.graal.hotspot", 1186 "com.oracle.graal.hotspot",
1222 ], 1187 ],
1223 "exclude" : deps(["JVMCI"]),
1224 "distDependencies" : deps([ 1188 "distDependencies" : deps([
1225 "jvmci:JVMCI_HOTSPOT", 1189 "jvmci:JVMCI_HOTSPOT",
1226 "GRAAL_COMPILER", 1190 "GRAAL_COMPILER",
1227 "GRAAL_RUNTIME", 1191 "GRAAL_RUNTIME",
1228 ]), 1192 ]),
1252 "jvmci:JVMCI_HOTSPOT", 1216 "jvmci:JVMCI_HOTSPOT",
1253 ]), 1217 ]),
1254 "exclude" : deps([ 1218 "exclude" : deps([
1255 "mx:JUNIT", 1219 "mx:JUNIT",
1256 "JAVA_ALLOCATION_INSTRUMENTER", 1220 "JAVA_ALLOCATION_INSTRUMENTER",
1257 "JVMCI"
1258 ]), 1221 ]),
1259 }, 1222 },
1260 1223
1261 "GRAAL_TRUFFLE" : { 1224 "GRAAL_TRUFFLE" : {
1262 "subDir" : "graal", 1225 "subDir" : "graal",
1379 "com.oracle.graal.hotspot", 1342 "com.oracle.graal.hotspot",
1380 "com.oracle.graal.truffle", 1343 "com.oracle.graal.truffle",
1381 "com.oracle.graal.truffle.hotspot.amd64", 1344 "com.oracle.graal.truffle.hotspot.amd64",
1382 "com.oracle.graal.truffle.hotspot.sparc" 1345 "com.oracle.graal.truffle.hotspot.sparc"
1383 ], 1346 ],
1384 "exclude" : deps(["JVMCI"]),
1385 "distDependencies" : [ 1347 "distDependencies" : [
1386 "truffle:TRUFFLE_API", 1348 "truffle:TRUFFLE_API",
1387 ], 1349 ],
1388 } 1350 }