Skip to content

Commit 3458f44

Browse files
udesouudesou
authored
Update v1.9.2+RAI (#155)
Updating the Julia version with the latest changes from https://github.com/RelationalAI/julia/tree/v1.9.2%2BRAI. Needs to be merged with mmtk/julia#55.
1 parent c1effcd commit 3458f44

File tree

4 files changed

+40
-38
lines changed

4 files changed

+40
-38
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ declare -a tests_to_skip=(
3232
# The required string int.jl does not appear in the output even if I test with the stock Julia code.
3333
# I do not know what is wrong, but at this point, I dont want to spend time on it.
3434
'@test occursin("int.jl", code)' "$JULIA_PATH/test/cmdlineargs.jl"
35+
# MMTk does not use --heap-size-hint=<size> option
36+
'@test readchomp(`$(Base.julia_cmd()) --startup-file=no --heap-size-hint=500M -e "println(@ccall jl_gc_get_max_memory()::UInt64)"`) == "524288000"' "$JULIA_PATH/test/cmdlineargs.jl"
3537

3638
# These are failing for v1.9.2 on the stock Julia as well.
3739
'@test process_running(p)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl"
3840
'@test occursin("Overhead ╎", s)' "$JULIA_PATH/stdlib/Profile/test/runtests.jl"
3941
'@test length(prof.allocs) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl"
4042
'@test length(\[a for a in prof.allocs if a.type == MyType\]) >= 1' "$JULIA_PATH/stdlib/Profile/test/allocs.jl"
41-
)
43+
)
4244

4345
for (( i=0; i < ${#tests_to_skip[@]}; i+=2 )); do
4446
pattern=${tests_to_skip[i]}

‎julia/mmtk_julia_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ typedef struct {
324324
mmtk_arraylist_t *last_remset;
325325

326326
// variables for allocating objects from pools
327-
#define JL_GC_N_POOLS 49
328-
mmtk_jl_gc_pool_t norm_pools[JL_GC_N_POOLS];
327+
#define JL_GC_N_MAX_POOLS 51
328+
mmtk_jl_gc_pool_t norm_pools[JL_GC_N_MAX_POOLS];
329329

330330
#define JL_N_STACK_POOLS 16
331331
mmtk_small_arraylist_t free_stacks[JL_N_STACK_POOLS];

‎mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2018"
1010
[package.metadata.julia]
1111
# Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
1212
julia_repo = "https://github.com/mmtk/julia.git"
13-
julia_version = "5bb4714e34084ae851d2b6ecb2c1da0242c912c0"
13+
julia_version = "88fea475d9639820488f6dd50fcb08c60a011899"
1414

1515
[lib]
1616
crate-type = ["cdylib"]

‎mmtk/src/julia_types.rs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.69.1 */
1+
/* automatically generated by rust-bindgen 0.63.0 */
22

33
#[repr(C)]
44
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -246,7 +246,7 @@ pub const HT_N_INLINE: u32 = 32;
246246
pub const AL_N_INLINE: u32 = 29;
247247
pub const SMALL_AL_N_INLINE: u32 = 6;
248248
pub const MAX_ALIGN: u32 = 4;
249-
pub const JL_GC_N_POOLS: u32 = 49;
249+
pub const JL_GC_N_MAX_POOLS: u32 = 51;
250250
pub const JL_N_STACK_POOLS: u32 = 16;
251251
pub const JL_GC_STATE_WAITING: u32 = 1;
252252
pub const JL_GC_STATE_SAFE: u32 = 2;
@@ -5625,7 +5625,7 @@ pub struct mmtk_jl_thread_heap_t {
56255625
pub remset_nptr: ::std::os::raw::c_int,
56265626
pub remset: *mut mmtk_arraylist_t,
56275627
pub last_remset: *mut mmtk_arraylist_t,
5628-
pub norm_pools: [mmtk_jl_gc_pool_t; 49usize],
5628+
pub norm_pools: [mmtk_jl_gc_pool_t; 51usize],
56295629
pub free_stacks: [mmtk_small_arraylist_t; 16usize],
56305630
}
56315631
#[test]
@@ -5635,7 +5635,7 @@ fn bindgen_test_layout_mmtk_jl_thread_heap_t() {
56355635
let ptr = UNINIT.as_ptr();
56365636
assert_eq!(
56375637
::std::mem::size_of::<mmtk_jl_thread_heap_t>(),
5638-
3144usize,
5638+
3192usize,
56395639
concat!("Size of: ", stringify!(mmtk_jl_thread_heap_t))
56405640
);
56415641
assert_eq!(
@@ -5755,7 +5755,7 @@ fn bindgen_test_layout_mmtk_jl_thread_heap_t() {
57555755
);
57565756
assert_eq!(
57575757
unsafe { ::std::ptr::addr_of!((*ptr).free_stacks) as usize - ptr as usize },
5758-
2120usize,
5758+
2168usize,
57595759
concat!(
57605760
"Offset of field: ",
57615761
stringify!(mmtk_jl_thread_heap_t),
@@ -6060,7 +6060,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
60606060
let ptr = UNINIT.as_ptr();
60616061
assert_eq!(
60626062
::std::mem::size_of::<mmtk__jl_tls_states_t>(),
6063-
13400usize,
6063+
13448usize,
60646064
concat!("Size of: ", stringify!(mmtk__jl_tls_states_t))
60656065
);
60666066
assert_eq!(
@@ -6180,7 +6180,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
61806180
);
61816181
assert_eq!(
61826182
unsafe { ::std::ptr::addr_of!((*ptr).gc_num) as usize - ptr as usize },
6183-
3184usize,
6183+
3232usize,
61846184
concat!(
61856185
"Offset of field: ",
61866186
stringify!(mmtk__jl_tls_states_t),
@@ -6190,7 +6190,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
61906190
);
61916191
assert_eq!(
61926192
unsafe { ::std::ptr::addr_of!((*ptr).defer_signal) as usize - ptr as usize },
6193-
3248usize,
6193+
3296usize,
61946194
concat!(
61956195
"Offset of field: ",
61966196
stringify!(mmtk__jl_tls_states_t),
@@ -6200,7 +6200,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62006200
);
62016201
assert_eq!(
62026202
unsafe { ::std::ptr::addr_of!((*ptr).current_task) as usize - ptr as usize },
6203-
3256usize,
6203+
3304usize,
62046204
concat!(
62056205
"Offset of field: ",
62066206
stringify!(mmtk__jl_tls_states_t),
@@ -6210,7 +6210,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62106210
);
62116211
assert_eq!(
62126212
unsafe { ::std::ptr::addr_of!((*ptr).next_task) as usize - ptr as usize },
6213-
3264usize,
6213+
3312usize,
62146214
concat!(
62156215
"Offset of field: ",
62166216
stringify!(mmtk__jl_tls_states_t),
@@ -6220,7 +6220,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62206220
);
62216221
assert_eq!(
62226222
unsafe { ::std::ptr::addr_of!((*ptr).previous_task) as usize - ptr as usize },
6223-
3272usize,
6223+
3320usize,
62246224
concat!(
62256225
"Offset of field: ",
62266226
stringify!(mmtk__jl_tls_states_t),
@@ -6230,7 +6230,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62306230
);
62316231
assert_eq!(
62326232
unsafe { ::std::ptr::addr_of!((*ptr).root_task) as usize - ptr as usize },
6233-
3280usize,
6233+
3328usize,
62346234
concat!(
62356235
"Offset of field: ",
62366236
stringify!(mmtk__jl_tls_states_t),
@@ -6240,7 +6240,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62406240
);
62416241
assert_eq!(
62426242
unsafe { ::std::ptr::addr_of!((*ptr).timing_stack) as usize - ptr as usize },
6243-
3288usize,
6243+
3336usize,
62446244
concat!(
62456245
"Offset of field: ",
62466246
stringify!(mmtk__jl_tls_states_t),
@@ -6250,7 +6250,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62506250
);
62516251
assert_eq!(
62526252
unsafe { ::std::ptr::addr_of!((*ptr).stackbase) as usize - ptr as usize },
6253-
3296usize,
6253+
3344usize,
62546254
concat!(
62556255
"Offset of field: ",
62566256
stringify!(mmtk__jl_tls_states_t),
@@ -6260,7 +6260,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62606260
);
62616261
assert_eq!(
62626262
unsafe { ::std::ptr::addr_of!((*ptr).stacksize) as usize - ptr as usize },
6263-
3304usize,
6263+
3352usize,
62646264
concat!(
62656265
"Offset of field: ",
62666266
stringify!(mmtk__jl_tls_states_t),
@@ -6270,7 +6270,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62706270
);
62716271
assert_eq!(
62726272
unsafe { ::std::ptr::addr_of!((*ptr).sig_exception) as usize - ptr as usize },
6273-
3512usize,
6273+
3560usize,
62746274
concat!(
62756275
"Offset of field: ",
62766276
stringify!(mmtk__jl_tls_states_t),
@@ -6280,7 +6280,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62806280
);
62816281
assert_eq!(
62826282
unsafe { ::std::ptr::addr_of!((*ptr).bt_data) as usize - ptr as usize },
6283-
3520usize,
6283+
3568usize,
62846284
concat!(
62856285
"Offset of field: ",
62866286
stringify!(mmtk__jl_tls_states_t),
@@ -6290,7 +6290,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
62906290
);
62916291
assert_eq!(
62926292
unsafe { ::std::ptr::addr_of!((*ptr).bt_size) as usize - ptr as usize },
6293-
3528usize,
6293+
3576usize,
62946294
concat!(
62956295
"Offset of field: ",
62966296
stringify!(mmtk__jl_tls_states_t),
@@ -6300,7 +6300,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63006300
);
63016301
assert_eq!(
63026302
unsafe { ::std::ptr::addr_of!((*ptr).profiling_bt_buffer) as usize - ptr as usize },
6303-
3536usize,
6303+
3584usize,
63046304
concat!(
63056305
"Offset of field: ",
63066306
stringify!(mmtk__jl_tls_states_t),
@@ -6310,7 +6310,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63106310
);
63116311
assert_eq!(
63126312
unsafe { ::std::ptr::addr_of!((*ptr).signal_request) as usize - ptr as usize },
6313-
3544usize,
6313+
3592usize,
63146314
concat!(
63156315
"Offset of field: ",
63166316
stringify!(mmtk__jl_tls_states_t),
@@ -6320,7 +6320,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63206320
);
63216321
assert_eq!(
63226322
unsafe { ::std::ptr::addr_of!((*ptr).io_wait) as usize - ptr as usize },
6323-
3548usize,
6323+
3596usize,
63246324
concat!(
63256325
"Offset of field: ",
63266326
stringify!(mmtk__jl_tls_states_t),
@@ -6330,7 +6330,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63306330
);
63316331
assert_eq!(
63326332
unsafe { ::std::ptr::addr_of!((*ptr).signal_stack) as usize - ptr as usize },
6333-
3552usize,
6333+
3600usize,
63346334
concat!(
63356335
"Offset of field: ",
63366336
stringify!(mmtk__jl_tls_states_t),
@@ -6340,7 +6340,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63406340
);
63416341
assert_eq!(
63426342
unsafe { ::std::ptr::addr_of!((*ptr).system_id) as usize - ptr as usize },
6343-
3560usize,
6343+
3608usize,
63446344
concat!(
63456345
"Offset of field: ",
63466346
stringify!(mmtk__jl_tls_states_t),
@@ -6350,7 +6350,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63506350
);
63516351
assert_eq!(
63526352
unsafe { ::std::ptr::addr_of!((*ptr).finalizers) as usize - ptr as usize },
6353-
3568usize,
6353+
3616usize,
63546354
concat!(
63556355
"Offset of field: ",
63566356
stringify!(mmtk__jl_tls_states_t),
@@ -6360,7 +6360,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63606360
);
63616361
assert_eq!(
63626362
unsafe { ::std::ptr::addr_of!((*ptr).page_metadata_allocd) as usize - ptr as usize },
6363-
3824usize,
6363+
3872usize,
63646364
concat!(
63656365
"Offset of field: ",
63666366
stringify!(mmtk__jl_tls_states_t),
@@ -6370,7 +6370,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63706370
);
63716371
assert_eq!(
63726372
unsafe { ::std::ptr::addr_of!((*ptr).page_metadata_buffered) as usize - ptr as usize },
6373-
3832usize,
6373+
3880usize,
63746374
concat!(
63756375
"Offset of field: ",
63766376
stringify!(mmtk__jl_tls_states_t),
@@ -6380,7 +6380,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63806380
);
63816381
assert_eq!(
63826382
unsafe { ::std::ptr::addr_of!((*ptr).mark_queue) as usize - ptr as usize },
6383-
3840usize,
6383+
3888usize,
63846384
concat!(
63856385
"Offset of field: ",
63866386
stringify!(mmtk__jl_tls_states_t),
@@ -6390,7 +6390,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
63906390
);
63916391
assert_eq!(
63926392
unsafe { ::std::ptr::addr_of!((*ptr).gc_cache) as usize - ptr as usize },
6393-
4144usize,
6393+
4192usize,
63946394
concat!(
63956395
"Offset of field: ",
63966396
stringify!(mmtk__jl_tls_states_t),
@@ -6400,7 +6400,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
64006400
);
64016401
assert_eq!(
64026402
unsafe { ::std::ptr::addr_of!((*ptr).sweep_objs) as usize - ptr as usize },
6403-
12360usize,
6403+
12408usize,
64046404
concat!(
64056405
"Offset of field: ",
64066406
stringify!(mmtk__jl_tls_states_t),
@@ -6410,7 +6410,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
64106410
);
64116411
assert_eq!(
64126412
unsafe { ::std::ptr::addr_of!((*ptr).gc_sweeps_requested) as usize - ptr as usize },
6413-
12616usize,
6413+
12664usize,
64146414
concat!(
64156415
"Offset of field: ",
64166416
stringify!(mmtk__jl_tls_states_t),
@@ -6420,7 +6420,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
64206420
);
64216421
assert_eq!(
64226422
unsafe { ::std::ptr::addr_of!((*ptr).previous_exception) as usize - ptr as usize },
6423-
12624usize,
6423+
12672usize,
64246424
concat!(
64256425
"Offset of field: ",
64266426
stringify!(mmtk__jl_tls_states_t),
@@ -6430,7 +6430,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
64306430
);
64316431
assert_eq!(
64326432
unsafe { ::std::ptr::addr_of!((*ptr).locks) as usize - ptr as usize },
6433-
12632usize,
6433+
12680usize,
64346434
concat!(
64356435
"Offset of field: ",
64366436
stringify!(mmtk__jl_tls_states_t),
@@ -6440,7 +6440,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
64406440
);
64416441
assert_eq!(
64426442
unsafe { ::std::ptr::addr_of!((*ptr).mmtk_mutator) as usize - ptr as usize },
6443-
12696usize,
6443+
12744usize,
64446444
concat!(
64456445
"Offset of field: ",
64466446
stringify!(mmtk__jl_tls_states_t),
@@ -6450,7 +6450,7 @@ fn bindgen_test_layout_mmtk__jl_tls_states_t() {
64506450
);
64516451
assert_eq!(
64526452
unsafe { ::std::ptr::addr_of!((*ptr).malloc_sz_since_last_poll) as usize - ptr as usize },
6453-
13392usize,
6453+
13440usize,
64546454
concat!(
64556455
"Offset of field: ",
64566456
stringify!(mmtk__jl_tls_states_t),

0 commit comments

Comments
 (0)