Skip to content

Commit 09b4032

Browse files
author
Harold Seigel
committedJul 1, 2022
8289534: Change 'uncomplicated' hotspot runtime options
Reviewed-by: coleenp, dholmes
·
JEP-429-branchpoint
1 parent a8fe2d9 commit 09b4032

File tree

10 files changed

+42
-41
lines changed

10 files changed

+42
-41
lines changed
 

‎src/hotspot/share/cds/filemap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,7 @@ int FileMapHeader::compute_crc() {
25192519
bool FileMapHeader::validate() {
25202520
if (_obj_alignment != ObjectAlignmentInBytes) {
25212521
FileMapInfo::fail_continue("The shared archive file's ObjectAlignmentInBytes of %d"
2522-
" does not equal the current ObjectAlignmentInBytes of " INTX_FORMAT ".",
2522+
" does not equal the current ObjectAlignmentInBytes of %d.",
25232523
_obj_alignment, ObjectAlignmentInBytes);
25242524
return false;
25252525
}

‎src/hotspot/share/cds/metaspaceShared.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,7 @@ void MetaspaceShared::print_on(outputStream* st) {
15801580
address top = (address)MetaspaceObj::shared_metaspace_top();
15811581
st->print("[" PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "), ", p2i(base), p2i(static_top), p2i(top));
15821582
st->print("size " SIZE_FORMAT ", ", top - base);
1583-
st->print("SharedBaseAddress: " PTR_FORMAT ", ArchiveRelocationMode: %d.", SharedBaseAddress, (int)ArchiveRelocationMode);
1583+
st->print("SharedBaseAddress: " PTR_FORMAT ", ArchiveRelocationMode: %d.", SharedBaseAddress, ArchiveRelocationMode);
15841584
} else {
15851585
st->print("CDS archive(s) not mapped");
15861586
}

‎src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2022, 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
@@ -194,7 +194,7 @@ JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
194194
return vmIntrinsics;
195195
}
196196

197-
#define PREDEFINED_CONFIG_FLAGS(do_bool_flag, do_intx_flag, do_uintx_flag) \
197+
#define PREDEFINED_CONFIG_FLAGS(do_bool_flag, do_int_flag, do_intx_flag, do_uintx_flag) \
198198
do_intx_flag(AllocateInstancePrefetchLines) \
199199
do_intx_flag(AllocatePrefetchDistance) \
200200
do_intx_flag(AllocatePrefetchInstr) \
@@ -218,7 +218,7 @@ JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
218218
do_intx_flag(JVMCICounterSize) \
219219
do_bool_flag(JVMCIPrintProperties) \
220220
do_bool_flag(JVMCIUseFastLocking) \
221-
do_intx_flag(ObjectAlignmentInBytes) \
221+
do_int_flag(ObjectAlignmentInBytes) \
222222
do_bool_flag(PrintInlining) \
223223
do_bool_flag(ReduceInitialCardMarks) \
224224
do_bool_flag(RestrictContended) \
@@ -393,14 +393,15 @@ jobjectArray readConfiguration0(JNIEnv *env, JVMCI_TRAPS) {
393393
JVMCIENV->put_object_at(vmFlags, i++, vmFlagObj); \
394394
}
395395
#define ADD_BOOL_FLAG(name) ADD_FLAG(bool, name, BOXED_BOOLEAN)
396+
#define ADD_INT_FLAG(name) ADD_FLAG(int, name, BOXED_LONG)
396397
#define ADD_INTX_FLAG(name) ADD_FLAG(intx, name, BOXED_LONG)
397398
#define ADD_UINTX_FLAG(name) ADD_FLAG(uintx, name, BOXED_LONG)
398399

399-
len = 0 + PREDEFINED_CONFIG_FLAGS(COUNT_FLAG, COUNT_FLAG, COUNT_FLAG);
400+
len = 0 + PREDEFINED_CONFIG_FLAGS(COUNT_FLAG, COUNT_FLAG, COUNT_FLAG, COUNT_FLAG);
400401
JVMCIObjectArray vmFlags = JVMCIENV->new_VMFlag_array(len, JVMCI_CHECK_NULL);
401402
int i = 0;
402403
JVMCIObject value;
403-
PREDEFINED_CONFIG_FLAGS(ADD_BOOL_FLAG, ADD_INTX_FLAG, ADD_UINTX_FLAG)
404+
PREDEFINED_CONFIG_FLAGS(ADD_BOOL_FLAG, ADD_INT_FLAG, ADD_INTX_FLAG, ADD_UINTX_FLAG)
404405

405406
JVMCIObjectArray vmIntrinsics = CompilerToVM::initialize_intrinsics(JVMCI_CHECK_NULL);
406407

‎src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
#include "runtime/task.hpp"
3333
#include "utilities/powerOfTwo.hpp"
3434

35-
JVMFlag::Error ObjectAlignmentInBytesConstraintFunc(intx value, bool verbose) {
35+
JVMFlag::Error ObjectAlignmentInBytesConstraintFunc(int value, bool verbose) {
3636
if (!is_power_of_2(value)) {
3737
JVMFlag::printError(verbose,
38-
"ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
38+
"ObjectAlignmentInBytes (%d) must be "
3939
"power of 2\n",
4040
value);
4141
return JVMFlag::VIOLATES_CONSTRAINT;
4242
}
4343
// In case page size is very small.
4444
if (value >= (intx)os::vm_page_size()) {
4545
JVMFlag::printError(verbose,
46-
"ObjectAlignmentInBytes (" INTX_FORMAT ") must be "
46+
"ObjectAlignmentInBytes (%d) must be "
4747
"less than page size (%d)\n",
4848
value, os::vm_page_size());
4949
return JVMFlag::VIOLATES_CONSTRAINT;

‎src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535

3636
#define RUNTIME_CONSTRAINTS(f) \
37-
f(intx, ObjectAlignmentInBytesConstraintFunc) \
37+
f(int, ObjectAlignmentInBytesConstraintFunc) \
3838
f(intx, ContendedPaddingWidthConstraintFunc) \
3939
f(intx, PerfDataSamplingIntervalFunc) \
4040
f(intx, ExtentLocalCacheSizeConstraintFunc) \

‎src/hotspot/share/runtime/globals.hpp

+23-23
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const size_t minimumSymbolTableSize = 1024;
129129
"Use 32-bit class pointers in 64-bit VM. " \
130130
"lp64_product means flag is always constant in 32 bit VM") \
131131
\
132-
product(intx, ObjectAlignmentInBytes, 8, \
132+
product(int, ObjectAlignmentInBytes, 8, \
133133
"Default object alignment in bytes, 8 is minimum") \
134134
range(8, 256) \
135135
constraint(ObjectAlignmentInBytesConstraintFunc, AtParse)
@@ -146,7 +146,7 @@ const size_t minimumSymbolTableSize = 1024;
146146
constraint)
147147
const bool UseCompressedOops = false;
148148
const bool UseCompressedClassPointers = false;
149-
const intx ObjectAlignmentInBytes = 8;
149+
const int ObjectAlignmentInBytes = 8;
150150

151151
#endif // _LP64
152152

@@ -474,13 +474,13 @@ const intx ObjectAlignmentInBytes = 8;
474474
product(bool, ExecutingUnitTests, false, \
475475
"Whether the JVM is running unit tests or not") \
476476
\
477-
develop(uintx, ErrorHandlerTest, 0, \
477+
develop(uint, ErrorHandlerTest, 0, \
478478
"If > 0, provokes an error after VM initialization; the value " \
479479
"determines which error to provoke. See controlled_crash() " \
480480
"in vmError.cpp.") \
481481
range(0, 17) \
482482
\
483-
develop(uintx, TestCrashInErrorHandler, 0, \
483+
develop(uint, TestCrashInErrorHandler, 0, \
484484
"If > 0, provokes an error inside VM error handler (a secondary " \
485485
"crash). see controlled_crash() in vmError.cpp") \
486486
range(0, 17) \
@@ -796,7 +796,7 @@ const intx ObjectAlignmentInBytes = 8;
796796
product(bool, RestrictContended, true, \
797797
"Restrict @Contended to trusted classes") \
798798
\
799-
product(intx, DiagnoseSyncOnValueBasedClasses, 0, DIAGNOSTIC, \
799+
product(int, DiagnoseSyncOnValueBasedClasses, 0, DIAGNOSTIC, \
800800
"Detect and take action upon identifying synchronization on " \
801801
"value based classes. Modes: " \
802802
"0: off; " \
@@ -1609,7 +1609,7 @@ const intx ObjectAlignmentInBytes = 8;
16091609
/* Priorities */ \
16101610
product_pd(bool, UseThreadPriorities, "Use native thread priorities") \
16111611
\
1612-
product(intx, ThreadPriorityPolicy, 0, \
1612+
product(int, ThreadPriorityPolicy, 0, \
16131613
"0 : Normal. "\
16141614
" VM chooses priorities that are appropriate for normal "\
16151615
" applications. "\
@@ -1634,53 +1634,53 @@ const intx ObjectAlignmentInBytes = 8;
16341634
product(bool, ThreadPriorityVerbose, false, \
16351635
"Print priority changes") \
16361636
\
1637-
product(intx, CompilerThreadPriority, -1, \
1637+
product(int, CompilerThreadPriority, -1, \
16381638
"The native priority at which compiler threads should run " \
16391639
"(-1 means no change)") \
16401640
range(min_jint, max_jint) \
16411641
\
1642-
product(intx, VMThreadPriority, -1, \
1642+
product(int, VMThreadPriority, -1, \
16431643
"The native priority at which the VM thread should run " \
16441644
"(-1 means no change)") \
16451645
range(-1, 127) \
16461646
\
1647-
product(intx, JavaPriority1_To_OSPriority, -1, \
1647+
product(int, JavaPriority1_To_OSPriority, -1, \
16481648
"Map Java priorities to OS priorities") \
16491649
range(-1, 127) \
16501650
\
1651-
product(intx, JavaPriority2_To_OSPriority, -1, \
1651+
product(int, JavaPriority2_To_OSPriority, -1, \
16521652
"Map Java priorities to OS priorities") \
16531653
range(-1, 127) \
16541654
\
1655-
product(intx, JavaPriority3_To_OSPriority, -1, \
1655+
product(int, JavaPriority3_To_OSPriority, -1, \
16561656
"Map Java priorities to OS priorities") \
16571657
range(-1, 127) \
16581658
\
1659-
product(intx, JavaPriority4_To_OSPriority, -1, \
1659+
product(int, JavaPriority4_To_OSPriority, -1, \
16601660
"Map Java priorities to OS priorities") \
16611661
range(-1, 127) \
16621662
\
1663-
product(intx, JavaPriority5_To_OSPriority, -1, \
1663+
product(int, JavaPriority5_To_OSPriority, -1, \
16641664
"Map Java priorities to OS priorities") \
16651665
range(-1, 127) \
16661666
\
1667-
product(intx, JavaPriority6_To_OSPriority, -1, \
1667+
product(int, JavaPriority6_To_OSPriority, -1, \
16681668
"Map Java priorities to OS priorities") \
16691669
range(-1, 127) \
16701670
\
1671-
product(intx, JavaPriority7_To_OSPriority, -1, \
1671+
product(int, JavaPriority7_To_OSPriority, -1, \
16721672
"Map Java priorities to OS priorities") \
16731673
range(-1, 127) \
16741674
\
1675-
product(intx, JavaPriority8_To_OSPriority, -1, \
1675+
product(int, JavaPriority8_To_OSPriority, -1, \
16761676
"Map Java priorities to OS priorities") \
16771677
range(-1, 127) \
16781678
\
1679-
product(intx, JavaPriority9_To_OSPriority, -1, \
1679+
product(int, JavaPriority9_To_OSPriority, -1, \
16801680
"Map Java priorities to OS priorities") \
16811681
range(-1, 127) \
16821682
\
1683-
product(intx, JavaPriority10_To_OSPriority,-1, \
1683+
product(int, JavaPriority10_To_OSPriority,-1, \
16841684
"Map Java priorities to OS priorities") \
16851685
range(-1, 127) \
16861686
\
@@ -1760,12 +1760,12 @@ const intx ObjectAlignmentInBytes = 8;
17601760
product(bool, PerfDisableSharedMem, false, \
17611761
"Store performance data in standard memory") \
17621762
\
1763-
product(intx, PerfDataMemorySize, 32*K, \
1763+
product(int, PerfDataMemorySize, 32*K, \
17641764
"Size of performance data memory region. Will be rounded " \
17651765
"up to a multiple of the native os page size.") \
17661766
range(128, 32*64*K) \
17671767
\
1768-
product(intx, PerfMaxStringConstLength, 1024, \
1768+
product(int, PerfMaxStringConstLength, 1024, \
17691769
"Maximum PerfStringConstant string length before truncation") \
17701770
range(32, 32*K) \
17711771
\
@@ -1775,7 +1775,7 @@ const intx ObjectAlignmentInBytes = 8;
17751775
product(bool, PerfBypassFileSystemCheck, false, \
17761776
"Bypass Win32 file system criteria checks (Windows Only)") \
17771777
\
1778-
product(intx, UnguardOnExecutionViolation, 0, \
1778+
product(int, UnguardOnExecutionViolation, 0, \
17791779
"Unguard page and retry on no-execute fault (Win32 only) " \
17801780
"0=off, 1=conservative, 2=aggressive") \
17811781
range(0, 2) \
@@ -1823,7 +1823,7 @@ const intx ObjectAlignmentInBytes = 8;
18231823
product(ccstr, SharedArchiveConfigFile, NULL, \
18241824
"Data to add to the CDS archive file") \
18251825
\
1826-
product(uintx, SharedSymbolTableBucketSize, 4, \
1826+
product(uint, SharedSymbolTableBucketSize, 4, \
18271827
"Average number of symbols per bucket in shared table") \
18281828
range(2, 246) \
18291829
\
@@ -1949,7 +1949,7 @@ const intx ObjectAlignmentInBytes = 8;
19491949
product(ccstr, ExtraSharedClassListFile, NULL, \
19501950
"Extra classlist for building the CDS archive file") \
19511951
\
1952-
product(intx, ArchiveRelocationMode, 0, DIAGNOSTIC, \
1952+
product(int, ArchiveRelocationMode, 0, DIAGNOSTIC, \
19531953
"(0) first map at preferred address, and if " \
19541954
"unsuccessful, map at alternative address (default); " \
19551955
"(1) always map at alternative address; " \

‎src/hotspot/share/runtime/perfMemory.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2022, 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
@@ -96,7 +96,7 @@ void PerfMemory::initialize() {
9696
size_t capacity = align_up(PerfDataMemorySize,
9797
os::vm_allocation_granularity());
9898

99-
log_debug(perf, memops)("PerfDataMemorySize = " SIZE_FORMAT ","
99+
log_debug(perf, memops)("PerfDataMemorySize = %d,"
100100
" os::vm_allocation_granularity = %d,"
101101
" adjusted size = " SIZE_FORMAT,
102102
PerfDataMemorySize,

‎src/hotspot/share/utilities/vmError.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -553,14 +553,14 @@ void VMError::report(outputStream* st, bool _verbose) {
553553
// error handler after a secondary crash works.
554554
STEP("test secondary crash 1")
555555
if (_verbose && TestCrashInErrorHandler == TEST_SECONDARY_CRASH) {
556-
st->print_cr("Will crash now (TestCrashInErrorHandler=" UINTX_FORMAT ")...",
556+
st->print_cr("Will crash now (TestCrashInErrorHandler=%u)...",
557557
TestCrashInErrorHandler);
558558
controlled_crash(TestCrashInErrorHandler);
559559
}
560560

561561
STEP("test secondary crash 2")
562562
if (_verbose && TestCrashInErrorHandler == TEST_SECONDARY_CRASH) {
563-
st->print_cr("Will crash now (TestCrashInErrorHandler=" UINTX_FORMAT ")...",
563+
st->print_cr("Will crash now (TestCrashInErrorHandler=%u)...",
564564
TestCrashInErrorHandler);
565565
controlled_crash(TestCrashInErrorHandler);
566566
}

‎src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2022, 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
@@ -975,7 +975,7 @@ public boolean isCompressedKlassPointersEnabled() {
975975
public int getObjectAlignmentInBytes() {
976976
if (objectAlignmentInBytes == 0) {
977977
Flag flag = getCommandLineFlag("ObjectAlignmentInBytes");
978-
objectAlignmentInBytes = (flag == null) ? 8 : (int)flag.getIntx();
978+
objectAlignmentInBytes = (flag == null) ? 8 : (int)flag.getInt();
979979
}
980980
return objectAlignmentInBytes;
981981
}

‎test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public class GetObjectSizeIntrinsicsTest extends ASimpleInstrumentationTestCase
304304
static final Boolean COMPRESSED_OOPS = WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompressedOops");
305305
static final long REF_SIZE = (COMPRESSED_OOPS == null || COMPRESSED_OOPS == true) ? 4 : 8;
306306

307-
static final Long align = WhiteBox.getWhiteBox().getIntxVMFlag("ObjectAlignmentInBytes");
307+
static final Long align = WhiteBox.getWhiteBox().getIntVMFlag("ObjectAlignmentInBytes");
308308
static final int OBJ_ALIGN = (align == null ? 8 : align.intValue());
309309

310310
static final int SMALL_ARRAY_SIZE = 1024;

0 commit comments

Comments
 (0)
Please sign in to comment.