Skip to content

Commit 7bc0d82

Browse files
author
Kim Barrett
committed
8359227: Code cache/heap size options should be size_t
Reviewed-by: mhaessig, tschatzl
1 parent b7fcd0b commit 7bc0d82

40 files changed

+190
-189
lines changed

‎src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -43,15 +43,15 @@ define_pd_global(intx, CompileThreshold, 1500 );
4343

4444
define_pd_global(intx, OnStackReplacePercentage, 933 );
4545
define_pd_global(intx, NewSizeThreadIncrease, 4*K );
46-
define_pd_global(intx, InitialCodeCacheSize, 160*K);
47-
define_pd_global(intx, ReservedCodeCacheSize, 32*M );
48-
define_pd_global(intx, NonProfiledCodeHeapSize, 13*M );
49-
define_pd_global(intx, ProfiledCodeHeapSize, 14*M );
50-
define_pd_global(intx, NonNMethodCodeHeapSize, 5*M );
46+
define_pd_global(size_t, InitialCodeCacheSize, 160*K);
47+
define_pd_global(size_t, ReservedCodeCacheSize, 32*M );
48+
define_pd_global(size_t, NonProfiledCodeHeapSize, 13*M );
49+
define_pd_global(size_t, ProfiledCodeHeapSize, 14*M );
50+
define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M );
5151
define_pd_global(bool, ProfileInterpreter, false);
52-
define_pd_global(intx, CodeCacheExpansionSize, 32*K );
53-
define_pd_global(uintx, CodeCacheMinBlockLength, 1);
54-
define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K);
52+
define_pd_global(size_t, CodeCacheExpansionSize, 32*K );
53+
define_pd_global(size_t, CodeCacheMinBlockLength, 1);
54+
define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K);
5555
define_pd_global(bool, NeverActAsServerClassMachine, true );
5656
define_pd_global(uint64_t,MaxRAM, 1ULL*G);
5757
define_pd_global(bool, CICompileOSR, true );

‎src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -51,8 +51,8 @@ define_pd_global(intx, NewSizeThreadIncrease, ScaleForWordSize(4*K));
5151
define_pd_global(intx, LoopUnrollLimit, 60);
5252
define_pd_global(intx, LoopPercentProfileLimit, 10);
5353
// InitialCodeCacheSize derived from specjbb2000 run.
54-
define_pd_global(intx, InitialCodeCacheSize, 2496*K); // Integral multiple of CodeCacheExpansionSize
55-
define_pd_global(intx, CodeCacheExpansionSize, 64*K);
54+
define_pd_global(size_t, InitialCodeCacheSize, 2496*K); // Integral multiple of CodeCacheExpansionSize
55+
define_pd_global(size_t, CodeCacheExpansionSize, 64*K);
5656

5757
// Ergonomics related flags
5858
define_pd_global(uint64_t,MaxRAM, 128ULL*G);
@@ -69,12 +69,12 @@ define_pd_global(bool, SuperWordLoopUnrollAnalysis, true);
6969
define_pd_global(uint, SuperWordStoreToLoadForwardingFailureDetection, 8);
7070
define_pd_global(bool, IdealizeClearArrayNode, true);
7171

72-
define_pd_global(intx, ReservedCodeCacheSize, 48*M);
73-
define_pd_global(intx, NonProfiledCodeHeapSize, 21*M);
74-
define_pd_global(intx, ProfiledCodeHeapSize, 22*M);
75-
define_pd_global(intx, NonNMethodCodeHeapSize, 5*M );
76-
define_pd_global(uintx, CodeCacheMinBlockLength, 6);
77-
define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K);
72+
define_pd_global(size_t, ReservedCodeCacheSize, 48*M);
73+
define_pd_global(size_t, NonProfiledCodeHeapSize, 21*M);
74+
define_pd_global(size_t, ProfiledCodeHeapSize, 22*M);
75+
define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M );
76+
define_pd_global(size_t, CodeCacheMinBlockLength, 6);
77+
define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K);
7878

7979
// Ergonomics related flags
8080
define_pd_global(bool, NeverActAsServerClassMachine, false);

‎src/hotspot/cpu/aarch64/globals_aarch64.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ define_pd_global(bool, UncommonNullCast, true); // Uncommon-trap nulls
3838

3939
define_pd_global(bool, DelayCompilerStubsGeneration, COMPILER2_OR_JVMCI);
4040

41-
define_pd_global(uintx, CodeCacheSegmentSize, 64);
41+
define_pd_global(size_t, CodeCacheSegmentSize, 64);
4242
define_pd_global(intx, CodeEntryAlignment, 64);
4343
define_pd_global(intx, OptoLoopAlignment, 16);
4444

‎src/hotspot/cpu/arm/c1_globals_arm.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ define_pd_global(size_t, ProfiledCodeHeapSize, 14*M );
5151
define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M );
5252
define_pd_global(bool, ProfileInterpreter, false);
5353
define_pd_global(size_t, CodeCacheExpansionSize, 32*K );
54-
define_pd_global(uintx, CodeCacheMinBlockLength, 1);
54+
define_pd_global(size_t, CodeCacheMinBlockLength, 1);
5555
define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K);
5656
define_pd_global(bool, NeverActAsServerClassMachine, true);
5757
define_pd_global(uint64_t, MaxRAM, 1ULL*G);

‎src/hotspot/cpu/arm/c2_globals_arm.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@ define_pd_global(size_t, CodeCacheExpansionSize, 32*K);
9494
// Ergonomics related flags
9595
define_pd_global(uint64_t, MaxRAM, 4ULL*G);
9696
#endif
97-
define_pd_global(uintx, CodeCacheMinBlockLength, 6);
97+
define_pd_global(size_t, CodeCacheMinBlockLength, 6);
9898
define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K);
9999

100100
define_pd_global(bool, TrapBasedRangeChecks, false); // Not needed

‎src/hotspot/cpu/arm/globals_arm.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,9 @@ define_pd_global(bool, TrapBasedNullChecks, false); // Not needed
3636

3737
define_pd_global(bool, DelayCompilerStubsGeneration, false); // No need - only few compiler's stubs
3838

39-
define_pd_global(uintx, CodeCacheSegmentSize, 64);
40-
define_pd_global(intx, CodeEntryAlignment, 16);
41-
define_pd_global(intx, OptoLoopAlignment, 16);
39+
define_pd_global(size_t, CodeCacheSegmentSize, 64);
40+
define_pd_global(intx, CodeEntryAlignment, 16);
41+
define_pd_global(intx, OptoLoopAlignment, 16);
4242

4343
#define DEFAULT_STACK_YELLOW_PAGES (2)
4444
#define DEFAULT_STACK_RED_PAGES (1)

‎src/hotspot/cpu/ppc/c1_globals_ppc.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2019 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -44,17 +44,17 @@ define_pd_global(intx, CompileThreshold, 1000);
4444

4545
define_pd_global(intx, OnStackReplacePercentage, 1400);
4646
define_pd_global(bool, ProfileInterpreter, false);
47-
define_pd_global(uintx, ReservedCodeCacheSize, 32*M);
48-
define_pd_global(uintx, NonProfiledCodeHeapSize, 13*M );
49-
define_pd_global(uintx, ProfiledCodeHeapSize, 14*M );
50-
define_pd_global(uintx, NonNMethodCodeHeapSize, 5*M );
51-
define_pd_global(uintx, CodeCacheExpansionSize, 32*K);
52-
define_pd_global(uintx, CodeCacheMinBlockLength, 1);
53-
define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K);
47+
define_pd_global(size_t, ReservedCodeCacheSize, 32*M);
48+
define_pd_global(size_t, NonProfiledCodeHeapSize, 13*M );
49+
define_pd_global(size_t, ProfiledCodeHeapSize, 14*M );
50+
define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M );
51+
define_pd_global(size_t, CodeCacheExpansionSize, 32*K);
52+
define_pd_global(size_t, CodeCacheMinBlockLength, 1);
53+
define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K);
5454
define_pd_global(bool, NeverActAsServerClassMachine, true);
5555
define_pd_global(size_t, NewSizeThreadIncrease, 16*K);
5656
define_pd_global(uint64_t, MaxRAM, 1ULL*G);
57-
define_pd_global(uintx, InitialCodeCacheSize, 160*K);
57+
define_pd_global(size_t, InitialCodeCacheSize, 160*K);
5858
#endif // !COMPILER2
5959

6060
define_pd_global(bool, UseTypeProfile, false);

‎src/hotspot/cpu/ppc/c2_globals_ppc.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2019 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -78,17 +78,17 @@ define_pd_global(uint, SuperWordStoreToLoadForwardingFailureDetection, 16);
7878
define_pd_global(bool, OptoScheduling, false);
7979
define_pd_global(bool, IdealizeClearArrayNode, true);
8080

81-
define_pd_global(uintx, InitialCodeCacheSize, 2048*K); // Integral multiple of CodeCacheExpansionSize
82-
define_pd_global(uintx, ReservedCodeCacheSize, 48*M);
83-
define_pd_global(uintx, NonProfiledCodeHeapSize, 21*M);
84-
define_pd_global(uintx, ProfiledCodeHeapSize, 22*M);
85-
define_pd_global(uintx, NonNMethodCodeHeapSize, 5*M );
86-
define_pd_global(uintx, CodeCacheExpansionSize, 64*K);
81+
define_pd_global(size_t, InitialCodeCacheSize, 2048*K); // Integral multiple of CodeCacheExpansionSize
82+
define_pd_global(size_t, ReservedCodeCacheSize, 48*M);
83+
define_pd_global(size_t, NonProfiledCodeHeapSize, 21*M);
84+
define_pd_global(size_t, ProfiledCodeHeapSize, 22*M);
85+
define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M );
86+
define_pd_global(size_t, CodeCacheExpansionSize, 64*K);
8787

8888
// Ergonomics related flags
8989
define_pd_global(uint64_t, MaxRAM, 128ULL*G);
90-
define_pd_global(uintx, CodeCacheMinBlockLength, 6);
91-
define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K);
90+
define_pd_global(size_t, CodeCacheMinBlockLength, 6);
91+
define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K);
9292

9393
define_pd_global(bool, TrapBasedRangeChecks, true);
9494

‎src/hotspot/cpu/ppc/globals_ppc.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2024 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -59,10 +59,10 @@ define_pd_global(intx, StackReservedPages, DEFAULT_STACK_RESERVED_PAGES);
5959
define_pd_global(bool, VMContinuations, true);
6060

6161
// Use large code-entry alignment.
62-
define_pd_global(uintx, CodeCacheSegmentSize, 128);
63-
define_pd_global(intx, CodeEntryAlignment, 64);
64-
define_pd_global(intx, OptoLoopAlignment, 16);
65-
define_pd_global(intx, InlineSmallCode, 1500);
62+
define_pd_global(size_t, CodeCacheSegmentSize, 128);
63+
define_pd_global(intx, CodeEntryAlignment, 64);
64+
define_pd_global(intx, OptoLoopAlignment, 16);
65+
define_pd_global(intx, InlineSmallCode, 1500);
6666

6767
// Flags for template interpreter.
6868
define_pd_global(bool, RewriteBytecodes, true);

‎src/hotspot/cpu/riscv/c1_globals_riscv.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -43,15 +43,15 @@ define_pd_global(intx, CompileThreshold, 1500 );
4343

4444
define_pd_global(intx, OnStackReplacePercentage, 933 );
4545
define_pd_global(intx, NewSizeThreadIncrease, 4*K );
46-
define_pd_global(intx, InitialCodeCacheSize, 160*K);
47-
define_pd_global(intx, ReservedCodeCacheSize, 32*M );
48-
define_pd_global(intx, NonProfiledCodeHeapSize, 13*M );
49-
define_pd_global(intx, ProfiledCodeHeapSize, 14*M );
50-
define_pd_global(intx, NonNMethodCodeHeapSize, 5*M );
46+
define_pd_global(size_t, InitialCodeCacheSize, 160*K);
47+
define_pd_global(size_t, ReservedCodeCacheSize, 32*M );
48+
define_pd_global(size_t, NonProfiledCodeHeapSize, 13*M );
49+
define_pd_global(size_t, ProfiledCodeHeapSize, 14*M );
50+
define_pd_global(size_t, NonNMethodCodeHeapSize, 5*M );
5151
define_pd_global(bool, ProfileInterpreter, false);
52-
define_pd_global(intx, CodeCacheExpansionSize, 32*K );
53-
define_pd_global(uintx, CodeCacheMinBlockLength, 1);
54-
define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K);
52+
define_pd_global(size_t, CodeCacheExpansionSize, 32*K );
53+
define_pd_global(size_t, CodeCacheMinBlockLength, 1);
54+
define_pd_global(size_t, CodeCacheMinimumUseSpace, 400*K);
5555
define_pd_global(bool, NeverActAsServerClassMachine, true );
5656
define_pd_global(uint64_t, MaxRAM, 1ULL*G);
5757
define_pd_global(bool, CICompileOSR, true );

0 commit comments

Comments
 (0)