Skip to content

Commit b6a589f

Browse files
qinsoonqinsoon
committed
Update mmtk-core dep, add tests
1 parent b7cdf24 commit b6a589f

File tree

5 files changed

+42
-3
lines changed

5 files changed

+42
-3
lines changed

‎.github/configs/base.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ configs:
102102
# TODO: We need to disable compressed oops for Compressor temporarily until it supports
103103
# discontiguous spaces.
104104
- "jdk11-master|ms|s|fail_on_oom|tph|preserve|no_compressed_oops|mmtk_gc-Compressor"
105+
- "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-ConcurrentImmix"
105106

106107
benchmarks:
107108
dacapo-23.9-RC3-chopin-ci:

‎.github/scripts/ci-expected-results.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ results:
1010
MarkSweep: pass
1111
MarkCompact: pass
1212
Compressor: pass
13+
ConcurrentImmix: pass
1314
batik:
1415
SemiSpace: pass
1516
GenCopy: pass
@@ -19,6 +20,7 @@ results:
1920
MarkSweep: pass
2021
MarkCompact: pass
2122
Compressor: pass
23+
ConcurrentImmix: pass
2224
biojava:
2325
SemiSpace: pass
2426
GenCopy: pass
@@ -28,6 +30,7 @@ results:
2830
MarkSweep: pass
2931
MarkCompact: pass
3032
Compressor: pass
33+
ConcurrentImmix: pass
3134
cassandra:
3235
SemiSpace: pass
3336
GenCopy: pass
@@ -37,6 +40,7 @@ results:
3740
MarkSweep: ignore
3841
MarkCompact: ignore
3942
Compressor: ignore
43+
ConcurrentImmix: ignore
4044
eclipse:
4145
SemiSpace: pass
4246
GenCopy: pass
@@ -46,6 +50,7 @@ results:
4650
MarkSweep: ignore
4751
MarkCompact: pass
4852
Compressor: pass
53+
ConcurrentImmix: pass
4954
fop:
5055
SemiSpace: pass
5156
GenCopy: pass
@@ -55,6 +60,7 @@ results:
5560
MarkSweep: ignore
5661
MarkCompact: pass
5762
Compressor: pass
63+
ConcurrentImmix: pass
5864
graphchi:
5965
SemiSpace: pass
6066
GenCopy: pass
@@ -64,6 +70,7 @@ results:
6470
MarkSweep: pass
6571
MarkCompact: pass
6672
Compressor: pass
73+
ConcurrentImmix: pass
6774
h2:
6875
SemiSpace: pass
6976
GenCopy: pass
@@ -73,6 +80,7 @@ results:
7380
MarkSweep: ignore
7481
MarkCompact: pass
7582
Compressor: pass
83+
ConcurrentImmix: pass
7684
h2o:
7785
SemiSpace: pass
7886
GenCopy: pass
@@ -82,6 +90,7 @@ results:
8290
MarkSweep: pass
8391
MarkCompact: pass
8492
Compressor: pass
93+
ConcurrentImmix: pass
8594
jme:
8695
SemiSpace: pass
8796
GenCopy: pass
@@ -91,6 +100,7 @@ results:
91100
MarkSweep: pass
92101
MarkCompact: pass
93102
Compressor: pass
103+
ConcurrentImmix: pass
94104
jython:
95105
SemiSpace: pass
96106
GenCopy: pass
@@ -100,6 +110,7 @@ results:
100110
MarkSweep: ignore
101111
MarkCompact: pass
102112
Compressor: pass
113+
ConcurrentImmix: pass
103114
kafka:
104115
SemiSpace: pass
105116
GenCopy: pass
@@ -109,6 +120,7 @@ results:
109120
MarkSweep: pass
110121
MarkCompact: ignore
111122
Compressor: pass
123+
ConcurrentImmix: pass
112124
luindex:
113125
SemiSpace: pass
114126
GenCopy: pass
@@ -118,6 +130,7 @@ results:
118130
MarkSweep: pass
119131
MarkCompact: pass
120132
Compressor: pass
133+
ConcurrentImmix: pass
121134
lusearch:
122135
SemiSpace: pass
123136
GenCopy: pass
@@ -127,6 +140,7 @@ results:
127140
MarkSweep: pass
128141
MarkCompact: pass
129142
Compressor: pass
143+
ConcurrentImmix: pass
130144
pmd:
131145
SemiSpace: pass
132146
GenCopy: pass
@@ -136,6 +150,7 @@ results:
136150
MarkSweep: pass
137151
MarkCompact: pass
138152
Compressor: pass
153+
ConcurrentImmix: pass
139154
sunflow:
140155
SemiSpace: pass
141156
GenCopy: pass
@@ -145,6 +160,7 @@ results:
145160
MarkSweep: pass
146161
MarkCompact: pass
147162
Compressor: pass
163+
ConcurrentImmix: pass
148164
tomcat:
149165
SemiSpace: pass
150166
GenCopy: pass
@@ -154,6 +170,7 @@ results:
154170
MarkSweep: pass
155171
MarkCompact: pass
156172
Compressor: pass
173+
ConcurrentImmix: pass
157174
xalan:
158175
SemiSpace: pass
159176
GenCopy: pass
@@ -172,6 +189,7 @@ results:
172189
MarkSweep: pass
173190
MarkCompact: pass
174191
Compressor: pass
192+
ConcurrentImmix: pass
175193

176194
release:
177195
avrora:
@@ -183,6 +201,7 @@ results:
183201
MarkSweep: pass
184202
MarkCompact: pass
185203
Compressor: pass
204+
ConcurrentImmix: pass
186205
batik:
187206
SemiSpace: pass
188207
GenCopy: pass
@@ -192,6 +211,7 @@ results:
192211
MarkSweep: pass
193212
MarkCompact: pass
194213
Compressor: pass
214+
ConcurrentImmix: pass
195215
biojava:
196216
SemiSpace: pass
197217
GenCopy: pass
@@ -201,6 +221,7 @@ results:
201221
MarkSweep: pass
202222
MarkCompact: pass
203223
Compressor: pass
224+
ConcurrentImmix: pass
204225
cassandra:
205226
SemiSpace: pass
206227
GenCopy: pass
@@ -210,6 +231,7 @@ results:
210231
MarkSweep: ignore
211232
MarkCompact: pass
212233
Compressor: pass
234+
ConcurrentImmix: pass
213235
eclipse:
214236
SemiSpace: pass
215237
GenCopy: pass
@@ -219,6 +241,7 @@ results:
219241
MarkSweep: ignore
220242
MarkCompact: pass
221243
Compressor: pass
244+
ConcurrentImmix: pass
222245
fop:
223246
SemiSpace: pass
224247
GenCopy: pass
@@ -228,6 +251,7 @@ results:
228251
MarkSweep: ignore
229252
MarkCompact: pass
230253
Compressor: pass
254+
ConcurrentImmix: pass
231255
graphchi:
232256
SemiSpace: pass
233257
GenCopy: pass
@@ -237,6 +261,7 @@ results:
237261
MarkSweep: pass
238262
MarkCompact: pass
239263
Compressor: pass
264+
ConcurrentImmix: pass
240265
h2:
241266
SemiSpace: pass
242267
GenCopy: pass
@@ -246,6 +271,7 @@ results:
246271
MarkSweep: ignore
247272
MarkCompact: pass
248273
Compressor: pass
274+
ConcurrentImmix: pass
249275
h2o:
250276
SemiSpace: pass
251277
GenCopy: pass
@@ -255,6 +281,7 @@ results:
255281
MarkSweep: ignore
256282
MarkCompact: pass
257283
Compressor: pass
284+
ConcurrentImmix: pass
258285
jme:
259286
SemiSpace: pass
260287
GenCopy: pass
@@ -264,6 +291,7 @@ results:
264291
MarkSweep: pass
265292
MarkCompact: pass
266293
Compressor: pass
294+
ConcurrentImmix: pass
267295
jython:
268296
SemiSpace: pass
269297
GenCopy: pass
@@ -273,6 +301,7 @@ results:
273301
MarkSweep: ignore
274302
MarkCompact: pass
275303
Compressor: pass
304+
ConcurrentImmix: pass
276305
kafka:
277306
SemiSpace: pass
278307
GenCopy: pass
@@ -282,6 +311,7 @@ results:
282311
MarkSweep: pass
283312
MarkCompact: pass
284313
Compressor: pass
314+
ConcurrentImmix: pass
285315
luindex:
286316
SemiSpace: pass
287317
GenCopy: pass
@@ -291,6 +321,7 @@ results:
291321
MarkSweep: pass
292322
MarkCompact: pass
293323
Compressor: pass
324+
ConcurrentImmix: pass
294325
lusearch:
295326
SemiSpace: pass
296327
GenCopy: pass
@@ -300,6 +331,7 @@ results:
300331
MarkSweep: pass
301332
MarkCompact: pass
302333
Compressor: pass
334+
ConcurrentImmix: pass
303335
pmd:
304336
SemiSpace: pass
305337
GenCopy: pass
@@ -309,6 +341,7 @@ results:
309341
MarkSweep: pass
310342
MarkCompact: pass
311343
Compressor: pass
344+
ConcurrentImmix: pass
312345
sunflow:
313346
SemiSpace: pass
314347
GenCopy: pass
@@ -318,6 +351,7 @@ results:
318351
MarkSweep: pass
319352
MarkCompact: pass
320353
Compressor: pass
354+
ConcurrentImmix: pass
321355
tomcat:
322356
SemiSpace: pass
323357
GenCopy: pass
@@ -327,6 +361,7 @@ results:
327361
MarkSweep: pass
328362
MarkCompact: pass
329363
Compressor: pass
364+
ConcurrentImmix: pass
330365
xalan:
331366
SemiSpace: ignore
332367
GenCopy: ignore
@@ -336,6 +371,7 @@ results:
336371
MarkSweep: pass
337372
MarkCompact: pass
338373
Compressor: pass
374+
ConcurrentImmix: pass
339375
zxing:
340376
SemiSpace: pass
341377
GenCopy: pass
@@ -345,3 +381,4 @@ results:
345381
MarkSweep: pass
346382
MarkCompact: pass
347383
Compressor: pass
384+
ConcurrentImmix: pass

‎.github/scripts/ci-test-minimal.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ MMTK_PLAN=MarkCompact runbms_dacapo2006_with_heap_multiplier fop 4
2626
# TODO: Need to temporarily disable compressed oops for the Compressor until it supports
2727
# discontiguous spaces.
2828
MMTK_PLAN=Compressor runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers
29+
MMTK_PLAN=ConcurrentImmix runbms_dacapo2006_with_heap_multiplier fop 4
2930
MMTK_PLAN=MarkSweep runbms_dacapo2006_with_heap_multiplier fop 8
3031
MMTK_PLAN=NoGC runbms_dacapo2006_with_heap_size fop 1000 1000
3132
# Test heap resizing

‎mmtk/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ probe = "0.5"
3535
# - change branch
3636
# - change repo name
3737
# But other changes including adding/removing whitespaces in commented lines may break the CI.
38-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "d93262b4397df4866a64a1d268689ae20f208713" }
38+
mmtk = { git = "https://github.com/tianleq/mmtk-core.git", rev = "100c04969bb6241339eaa45eba0e9b9ba219ebb3" }
3939
# Uncomment the following to build locally
4040
# mmtk = { path = "../../mmtk-core" }
4141

0 commit comments

Comments
 (0)