Skip to content

Commit 83b0f89

Browse files
keithc-cakeithc-ca
committed
Use sysinfo functions from OMR; remove duplicate code in OpenJ9
Remove API functions: j9sysinfo_get_processor_description() j9sysinfo_processor_has_feature() Remove types: J9ProcessorArchitecture J9ProcessorDesc Remove constants: J9PORT_*_FEATURE_* J9PORT_HWCAP_S390_* Remove now-unused helper functions. Signed-off-by: Keith W. Campbell <[email protected]>
1 parent 8adae83 commit 83b0f89

File tree

15 files changed

+213
-1998
lines changed

15 files changed

+213
-1998
lines changed

‎debugtools/DDR_VM/data/superset-constants.dat‎

Lines changed: 0 additions & 223 deletions
Original file line numberDiff line numberDiff line change
@@ -2736,34 +2736,6 @@ C|J9PORT_INFO_SHSEM_STAT_PASSED
27362736
C|J9PORT_INVALID_FD
27372737
C|J9PORT_MAJOR_VERSION_NUMBER
27382738
C|J9PORT_MINOR_VERSION_NUMBER
2739-
C|J9PORT_PPC_FEATURE_32
2740-
C|J9PORT_PPC_FEATURE_601_INSTR
2741-
C|J9PORT_PPC_FEATURE_64
2742-
C|J9PORT_PPC_FEATURE_ARCH_2_05
2743-
C|J9PORT_PPC_FEATURE_ARCH_2_06
2744-
C|J9PORT_PPC_FEATURE_BOOKE
2745-
C|J9PORT_PPC_FEATURE_CELL_BE
2746-
C|J9PORT_PPC_FEATURE_HAS_4xxMAC
2747-
C|J9PORT_PPC_FEATURE_HAS_ALTIVEC
2748-
C|J9PORT_PPC_FEATURE_HAS_DFP
2749-
C|J9PORT_PPC_FEATURE_HAS_EFP_DOUBLE
2750-
C|J9PORT_PPC_FEATURE_HAS_EFP_SINGLE
2751-
C|J9PORT_PPC_FEATURE_HAS_FPU
2752-
C|J9PORT_PPC_FEATURE_HAS_MMU
2753-
C|J9PORT_PPC_FEATURE_HAS_SPE
2754-
C|J9PORT_PPC_FEATURE_HAS_VSX
2755-
C|J9PORT_PPC_FEATURE_ICACHE_SNOOP
2756-
C|J9PORT_PPC_FEATURE_NO_TB
2757-
C|J9PORT_PPC_FEATURE_PA6T
2758-
C|J9PORT_PPC_FEATURE_POWER4
2759-
C|J9PORT_PPC_FEATURE_POWER5
2760-
C|J9PORT_PPC_FEATURE_POWER5_PLUS
2761-
C|J9PORT_PPC_FEATURE_POWER6_EXT
2762-
C|J9PORT_PPC_FEATURE_PPC_LE
2763-
C|J9PORT_PPC_FEATURE_PSERIES_PERFMON_COMPAT
2764-
C|J9PORT_PPC_FEATURE_SMT
2765-
C|J9PORT_PPC_FEATURE_TRUE_LE
2766-
C|J9PORT_PPC_FEATURE_UNIFIED_CACHE
27672739
C|J9PORT_PROCESS_CREATE_NEW_PROCESS_GROUP
27682740
C|J9PORT_PROCESS_DO_NOT_CLOSE_STREAMS
27692741
C|J9PORT_PROCESS_IGNORE_OUTPUT
@@ -2776,34 +2748,6 @@ C|J9PORT_PROCESS_REDIRECT_STDERR_TO_STDOUT
27762748
C|J9PORT_PROCESS_STDERR
27772749
C|J9PORT_PROCESS_STDIN
27782750
C|J9PORT_PROCESS_STDOUT
2779-
C|J9PORT_S390_FEATURE_DFP
2780-
C|J9PORT_S390_FEATURE_ESAN3
2781-
C|J9PORT_S390_FEATURE_ETF3_ENHANCEMENT
2782-
C|J9PORT_S390_FEATURE_EXTENDED_IMMEDIATE
2783-
C|J9PORT_S390_FEATURE_EXTENDED_TRANSLATION_3
2784-
C|J9PORT_S390_FEATURE_GENERAL_INSTRUCTIONS_EXTENSIONS
2785-
C|J9PORT_S390_FEATURE_GUARDED_STORAGE
2786-
C|J9PORT_S390_FEATURE_HIGH_GPRS
2787-
C|J9PORT_S390_FEATURE_HPAGE
2788-
C|J9PORT_S390_FEATURE_LOAD_AND_ZERO_RIGHTMOST_BYTE
2789-
C|J9PORT_S390_FEATURE_LOAD_STORE_ON_CONDITION_1
2790-
C|J9PORT_S390_FEATURE_LOAD_STORE_ON_CONDITION_2
2791-
C|J9PORT_S390_FEATURE_LONG_DISPLACEMENT
2792-
C|J9PORT_S390_FEATURE_MISCELLANEOUS_INSTRUCTION_EXTENSION
2793-
C|J9PORT_S390_FEATURE_MISCELLANEOUS_INSTRUCTION_EXTENSION_2
2794-
C|J9PORT_S390_FEATURE_MSA
2795-
C|J9PORT_S390_FEATURE_MSA_EXTENSION3
2796-
C|J9PORT_S390_FEATURE_MSA_EXTENSION4
2797-
C|J9PORT_S390_FEATURE_MSA_EXTENSION_5
2798-
C|J9PORT_S390_FEATURE_MSA_EXTENSION_8
2799-
C|J9PORT_S390_FEATURE_SEMAPHORE_ASSIST
2800-
C|J9PORT_S390_FEATURE_SIDE_EFFECT_ACCESS
2801-
C|J9PORT_S390_FEATURE_STFLE
2802-
C|J9PORT_S390_FEATURE_TE
2803-
C|J9PORT_S390_FEATURE_VECTOR_FACILITY
2804-
C|J9PORT_S390_FEATURE_VECTOR_FACILITY_ENHANCEMENT_1
2805-
C|J9PORT_S390_FEATURE_VECTOR_PACKED_DECIMAL
2806-
C|J9PORT_S390_FEATURE_ZARCH
28072751
C|J9PORT_SHMEM_EYECATCHER_LENGTH
28082752
C|J9PORT_SHSEM_MODE_DEFAULT
28092753
C|J9PORT_SHSEM_MODE_NOWAIT
@@ -2814,38 +2758,6 @@ C|J9PORT_SYSINFO_GET_HW_INFO_MODEL
28142758
C|J9PORT_SYSINFO_GET_HW_INFO_NOT_AVAILABLE
28152759
C|J9PORT_SYSINFO_GET_HW_INFO_SUCCESS
28162760
C|J9PORT_SYSINFO_HW_INFO_MODEL_BUF_LENGTH
2817-
C|J9PORT_X86_FEATURE_10
2818-
C|J9PORT_X86_FEATURE_20
2819-
C|J9PORT_X86_FEATURE_30
2820-
C|J9PORT_X86_FEATURE_ACPI
2821-
C|J9PORT_X86_FEATURE_APIC
2822-
C|J9PORT_X86_FEATURE_CLFSH
2823-
C|J9PORT_X86_FEATURE_CMOV
2824-
C|J9PORT_X86_FEATURE_CX8
2825-
C|J9PORT_X86_FEATURE_DE
2826-
C|J9PORT_X86_FEATURE_DS
2827-
C|J9PORT_X86_FEATURE_FPU
2828-
C|J9PORT_X86_FEATURE_FXSR
2829-
C|J9PORT_X86_FEATURE_HTT
2830-
C|J9PORT_X86_FEATURE_MCA
2831-
C|J9PORT_X86_FEATURE_MCE
2832-
C|J9PORT_X86_FEATURE_MMX
2833-
C|J9PORT_X86_FEATURE_MSR
2834-
C|J9PORT_X86_FEATURE_MTRR
2835-
C|J9PORT_X86_FEATURE_PAE
2836-
C|J9PORT_X86_FEATURE_PAT
2837-
C|J9PORT_X86_FEATURE_PBE
2838-
C|J9PORT_X86_FEATURE_PGE
2839-
C|J9PORT_X86_FEATURE_PSE
2840-
C|J9PORT_X86_FEATURE_PSE_36
2841-
C|J9PORT_X86_FEATURE_PSN
2842-
C|J9PORT_X86_FEATURE_SEP
2843-
C|J9PORT_X86_FEATURE_SS
2844-
C|J9PORT_X86_FEATURE_SSE
2845-
C|J9PORT_X86_FEATURE_SSE2
2846-
C|J9PORT_X86_FEATURE_TM
2847-
C|J9PORT_X86_FEATURE_TSC
2848-
C|J9PORT_X86_FEATURE_VME
28492761
C|J9SHMEM_NO_FLAGS
28502762
C|J9SHMEM_OPEN_DO_NOT_CREATE
28512763
C|J9SHMEM_OPEN_FOR_DESTROY
@@ -2959,34 +2871,6 @@ C|J9PORT_INFO_SHSEM_STAT_PASSED
29592871
C|J9PORT_INVALID_FD
29602872
C|J9PORT_MAJOR_VERSION_NUMBER
29612873
C|J9PORT_MINOR_VERSION_NUMBER
2962-
C|J9PORT_PPC_FEATURE_32
2963-
C|J9PORT_PPC_FEATURE_601_INSTR
2964-
C|J9PORT_PPC_FEATURE_64
2965-
C|J9PORT_PPC_FEATURE_ARCH_2_05
2966-
C|J9PORT_PPC_FEATURE_ARCH_2_06
2967-
C|J9PORT_PPC_FEATURE_BOOKE
2968-
C|J9PORT_PPC_FEATURE_CELL_BE
2969-
C|J9PORT_PPC_FEATURE_HAS_4xxMAC
2970-
C|J9PORT_PPC_FEATURE_HAS_ALTIVEC
2971-
C|J9PORT_PPC_FEATURE_HAS_DFP
2972-
C|J9PORT_PPC_FEATURE_HAS_EFP_DOUBLE
2973-
C|J9PORT_PPC_FEATURE_HAS_EFP_SINGLE
2974-
C|J9PORT_PPC_FEATURE_HAS_FPU
2975-
C|J9PORT_PPC_FEATURE_HAS_MMU
2976-
C|J9PORT_PPC_FEATURE_HAS_SPE
2977-
C|J9PORT_PPC_FEATURE_HAS_VSX
2978-
C|J9PORT_PPC_FEATURE_ICACHE_SNOOP
2979-
C|J9PORT_PPC_FEATURE_NO_TB
2980-
C|J9PORT_PPC_FEATURE_PA6T
2981-
C|J9PORT_PPC_FEATURE_POWER4
2982-
C|J9PORT_PPC_FEATURE_POWER5
2983-
C|J9PORT_PPC_FEATURE_POWER5_PLUS
2984-
C|J9PORT_PPC_FEATURE_POWER6_EXT
2985-
C|J9PORT_PPC_FEATURE_PPC_LE
2986-
C|J9PORT_PPC_FEATURE_PSERIES_PERFMON_COMPAT
2987-
C|J9PORT_PPC_FEATURE_SMT
2988-
C|J9PORT_PPC_FEATURE_TRUE_LE
2989-
C|J9PORT_PPC_FEATURE_UNIFIED_CACHE
29902874
C|J9PORT_PROCESS_CREATE_NEW_PROCESS_GROUP
29912875
C|J9PORT_PROCESS_DO_NOT_CLOSE_STREAMS
29922876
C|J9PORT_PROCESS_IGNORE_OUTPUT
@@ -2999,34 +2883,6 @@ C|J9PORT_PROCESS_REDIRECT_STDERR_TO_STDOUT
29992883
C|J9PORT_PROCESS_STDERR
30002884
C|J9PORT_PROCESS_STDIN
30012885
C|J9PORT_PROCESS_STDOUT
3002-
C|J9PORT_S390_FEATURE_DFP
3003-
C|J9PORT_S390_FEATURE_ESAN3
3004-
C|J9PORT_S390_FEATURE_ETF3_ENHANCEMENT
3005-
C|J9PORT_S390_FEATURE_EXTENDED_IMMEDIATE
3006-
C|J9PORT_S390_FEATURE_EXTENDED_TRANSLATION_3
3007-
C|J9PORT_S390_FEATURE_GENERAL_INSTRUCTIONS_EXTENSIONS
3008-
C|J9PORT_S390_FEATURE_GUARDED_STORAGE
3009-
C|J9PORT_S390_FEATURE_HIGH_GPRS
3010-
C|J9PORT_S390_FEATURE_HPAGE
3011-
C|J9PORT_S390_FEATURE_LOAD_AND_ZERO_RIGHTMOST_BYTE
3012-
C|J9PORT_S390_FEATURE_LOAD_STORE_ON_CONDITION_1
3013-
C|J9PORT_S390_FEATURE_LOAD_STORE_ON_CONDITION_2
3014-
C|J9PORT_S390_FEATURE_LONG_DISPLACEMENT
3015-
C|J9PORT_S390_FEATURE_MISCELLANEOUS_INSTRUCTION_EXTENSION
3016-
C|J9PORT_S390_FEATURE_MISCELLANEOUS_INSTRUCTION_EXTENSION_2
3017-
C|J9PORT_S390_FEATURE_MSA
3018-
C|J9PORT_S390_FEATURE_MSA_EXTENSION3
3019-
C|J9PORT_S390_FEATURE_MSA_EXTENSION4
3020-
C|J9PORT_S390_FEATURE_MSA_EXTENSION_5
3021-
C|J9PORT_S390_FEATURE_MSA_EXTENSION_8
3022-
C|J9PORT_S390_FEATURE_SEMAPHORE_ASSIST
3023-
C|J9PORT_S390_FEATURE_SIDE_EFFECT_ACCESS
3024-
C|J9PORT_S390_FEATURE_STFLE
3025-
C|J9PORT_S390_FEATURE_TE
3026-
C|J9PORT_S390_FEATURE_VECTOR_FACILITY
3027-
C|J9PORT_S390_FEATURE_VECTOR_FACILITY_ENHANCEMENT_1
3028-
C|J9PORT_S390_FEATURE_VECTOR_PACKED_DECIMAL
3029-
C|J9PORT_S390_FEATURE_ZARCH
30302886
C|J9PORT_SHMEM_EYECATCHER_LENGTH
30312887
C|J9PORT_SHSEM_MODE_DEFAULT
30322888
C|J9PORT_SHSEM_MODE_NOWAIT
@@ -3037,38 +2893,6 @@ C|J9PORT_SYSINFO_GET_HW_INFO_MODEL
30372893
C|J9PORT_SYSINFO_GET_HW_INFO_NOT_AVAILABLE
30382894
C|J9PORT_SYSINFO_GET_HW_INFO_SUCCESS
30392895
C|J9PORT_SYSINFO_HW_INFO_MODEL_BUF_LENGTH
3040-
C|J9PORT_X86_FEATURE_10
3041-
C|J9PORT_X86_FEATURE_20
3042-
C|J9PORT_X86_FEATURE_30
3043-
C|J9PORT_X86_FEATURE_ACPI
3044-
C|J9PORT_X86_FEATURE_APIC
3045-
C|J9PORT_X86_FEATURE_CLFSH
3046-
C|J9PORT_X86_FEATURE_CMOV
3047-
C|J9PORT_X86_FEATURE_CX8
3048-
C|J9PORT_X86_FEATURE_DE
3049-
C|J9PORT_X86_FEATURE_DS
3050-
C|J9PORT_X86_FEATURE_FPU
3051-
C|J9PORT_X86_FEATURE_FXSR
3052-
C|J9PORT_X86_FEATURE_HTT
3053-
C|J9PORT_X86_FEATURE_MCA
3054-
C|J9PORT_X86_FEATURE_MCE
3055-
C|J9PORT_X86_FEATURE_MMX
3056-
C|J9PORT_X86_FEATURE_MSR
3057-
C|J9PORT_X86_FEATURE_MTRR
3058-
C|J9PORT_X86_FEATURE_PAE
3059-
C|J9PORT_X86_FEATURE_PAT
3060-
C|J9PORT_X86_FEATURE_PBE
3061-
C|J9PORT_X86_FEATURE_PGE
3062-
C|J9PORT_X86_FEATURE_PSE
3063-
C|J9PORT_X86_FEATURE_PSE_36
3064-
C|J9PORT_X86_FEATURE_PSN
3065-
C|J9PORT_X86_FEATURE_SEP
3066-
C|J9PORT_X86_FEATURE_SS
3067-
C|J9PORT_X86_FEATURE_SSE
3068-
C|J9PORT_X86_FEATURE_SSE2
3069-
C|J9PORT_X86_FEATURE_TM
3070-
C|J9PORT_X86_FEATURE_TSC
3071-
C|J9PORT_X86_FEATURE_VME
30722896
C|J9SHMEM_NO_FLAGS
30732897
C|J9SHMEM_OPEN_DO_NOT_CREATE
30742898
C|J9SHMEM_OPEN_FOR_DESTROY
@@ -3354,53 +3178,6 @@ C|J9InitCopyLongs
33543178
C|J9InitCopyLongsW
33553179
C|J9InitCopySingles
33563180
C|J9InitCopySinglesW
3357-
S|J9ProcessorArchitecture|J9ProcessorArchitecturePointer|
3358-
C|PROCESSOR_DUMMY
3359-
C|PROCESSOR_PPC_7XX
3360-
C|PROCESSOR_PPC_GP
3361-
C|PROCESSOR_PPC_GR
3362-
C|PROCESSOR_PPC_NSTAR
3363-
C|PROCESSOR_PPC_P6
3364-
C|PROCESSOR_PPC_P7
3365-
C|PROCESSOR_PPC_P8
3366-
C|PROCESSOR_PPC_P9
3367-
C|PROCESSOR_PPC_PULSAR
3368-
C|PROCESSOR_PPC_PWR403
3369-
C|PROCESSOR_PPC_PWR405
3370-
C|PROCESSOR_PPC_PWR440
3371-
C|PROCESSOR_PPC_PWR601
3372-
C|PROCESSOR_PPC_PWR602
3373-
C|PROCESSOR_PPC_PWR603
3374-
C|PROCESSOR_PPC_PWR604
3375-
C|PROCESSOR_PPC_PWR620
3376-
C|PROCESSOR_PPC_PWR630
3377-
C|PROCESSOR_PPC_RIOS1
3378-
C|PROCESSOR_PPC_RIOS2
3379-
C|PROCESSOR_PPC_UNKNOWN
3380-
C|PROCESSOR_S390_GP10
3381-
C|PROCESSOR_S390_GP11
3382-
C|PROCESSOR_S390_GP12
3383-
C|PROCESSOR_S390_GP13
3384-
C|PROCESSOR_S390_GP6
3385-
C|PROCESSOR_S390_GP7
3386-
C|PROCESSOR_S390_GP8
3387-
C|PROCESSOR_S390_GP9
3388-
C|PROCESSOR_S390_UNKNOWN
3389-
C|PROCESSOR_UNDEFINED
3390-
C|PROCESSOR_X86_AMDATHLONDURON
3391-
C|PROCESSOR_X86_AMDK5
3392-
C|PROCESSOR_X86_AMDK6
3393-
C|PROCESSOR_X86_AMDOPTERON
3394-
C|PROCESSOR_X86_INTELCORE2
3395-
C|PROCESSOR_X86_INTELHASWELL
3396-
C|PROCESSOR_X86_INTELNEHALEM
3397-
C|PROCESSOR_X86_INTELP6
3398-
C|PROCESSOR_X86_INTELPENTIUM
3399-
C|PROCESSOR_X86_INTELPENTIUM4
3400-
C|PROCESSOR_X86_INTELSANDYBRIDGE
3401-
C|PROCESSOR_X86_INTELTULSA
3402-
C|PROCESSOR_X86_INTELWESTMERE
3403-
C|PROCESSOR_X86_UNKNOWN
34043181
S|J9RASdumpAgent|J9RASdumpAgentPointer|
34053182
C|J9RAS_DUMP_DO_ATTACH_THREAD
34063183
C|J9RAS_DUMP_DO_COMPACT_HEAP

‎runtime/gc_modron_startup/mminit.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3036,12 +3036,12 @@ gcInitializeDefaults(J9JavaVM* vm)
30363036
extensions->concurrentScavenger = true;
30373037

30383038
if (LOADED == (FIND_DLL_TABLE_ENTRY(J9_JIT_DLL_NAME)->loadFlags & LOADED)) {
3039-
3040-
/* Check for supported hardware */
3041-
J9ProcessorDesc processorDesc;
3042-
j9sysinfo_get_processor_description(&processorDesc);
3043-
bool hwSupported = j9sysinfo_processor_has_feature(&processorDesc, J9PORT_S390_FEATURE_GUARDED_STORAGE) &&
3044-
j9sysinfo_processor_has_feature(&processorDesc, J9PORT_S390_FEATURE_SIDE_EFFECT_ACCESS);
3039+
/* Check for supported hardware. */
3040+
OMRPORT_ACCESS_FROM_J9PORT(PORTLIB);
3041+
OMRProcessorDesc processorDesc;
3042+
omrsysinfo_get_processor_description(&processorDesc);
3043+
bool hwSupported = omrsysinfo_processor_has_feature(&processorDesc, OMR_FEATURE_S390_GUARDED_STORAGE)
3044+
&& omrsysinfo_processor_has_feature(&processorDesc, OMR_FEATURE_S390_SIDE_EFFECT_ACCESS);
30453045

30463046
if (hwSupported) {
30473047
/*

‎runtime/jcl/common/sun_misc_Unsafe.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -887,19 +887,19 @@ Java_jdk_internal_misc_Unsafe_writebackMemory(JNIEnv *env, jobject receiver, jlo
887887

888888
VM_AtomicSupport::readWriteBarrier();
889889
switch (vm->cpuCacheWritebackCapabilities) {
890-
case J9PORT_X86_FEATURE_CLWB:
890+
case OMR_FEATURE_X86_CLWB:
891891
do {
892892
cacheLine += cacheLineSize;
893893
asm volatile("clwb %0" : "+m" (*(U_8 *)cacheLine));
894894
} while (lastCacheLine != cacheLine);
895895
break;
896-
case J9PORT_X86_FEATURE_CLFLUSHOPT:
896+
case OMR_FEATURE_X86_CLFLUSHOPT:
897897
do {
898898
cacheLine += cacheLineSize;
899899
asm volatile("clflushopt %0" : "+m" (*(U_8 *)cacheLine));
900900
} while (lastCacheLine != cacheLine);
901901
break;
902-
case J9PORT_X86_FEATURE_CLFSH:
902+
case OMR_FEATURE_X86_CLFSH:
903903
do {
904904
cacheLine += cacheLineSize;
905905
asm volatile("clflush %0" : "+m" (*(U_8 *)cacheLine));
@@ -937,9 +937,9 @@ Java_jdk_internal_misc_Unsafe_isWritebackEnabled(JNIEnv *env, jclass clazz)
937937
J9JavaVM *vm = currentThread->javaVM;
938938
if (vm->dCacheLineSize > 0) {
939939
switch (vm->cpuCacheWritebackCapabilities) {
940-
case J9PORT_X86_FEATURE_CLWB:
941-
case J9PORT_X86_FEATURE_CLFLUSHOPT:
942-
case J9PORT_X86_FEATURE_CLFSH:
940+
case OMR_FEATURE_X86_CLFLUSHOPT:
941+
case OMR_FEATURE_X86_CLFSH:
942+
case OMR_FEATURE_X86_CLWB:
943943
result = JNI_TRUE;
944944
break;
945945
default:

0 commit comments

Comments
 (0)