1.1 --- a/src/share/vm/runtime/globals.hpp Wed Apr 27 01:25:04 2016 +0800
1.2 +++ b/src/share/vm/runtime/globals.hpp Fri Apr 29 00:06:10 2016 +0800
1.3 @@ -22,6 +22,12 @@
1.4 *
1.5 */
1.6
1.7 +/*
1.8 + * This file has been modified by Loongson Technology in 2015. These
1.9 + * modifications are Copyright (c) 2015 Loongson Technology, and are made
1.10 + * available on the same license terms set forth above.
1.11 + */
1.12 +
1.13 #ifndef SHARE_VM_RUNTIME_GLOBALS_HPP
1.14 #define SHARE_VM_RUNTIME_GLOBALS_HPP
1.15
1.16 @@ -52,6 +58,9 @@
1.17 #ifdef TARGET_ARCH_ppc
1.18 # include "globals_ppc.hpp"
1.19 #endif
1.20 +#ifdef TARGET_ARCH_mips
1.21 +# include "globals_mips.hpp"
1.22 +#endif
1.23 #ifdef TARGET_OS_FAMILY_linux
1.24 # include "globals_linux.hpp"
1.25 #endif
1.26 @@ -73,6 +82,9 @@
1.27 #ifdef TARGET_OS_ARCH_linux_sparc
1.28 # include "globals_linux_sparc.hpp"
1.29 #endif
1.30 +#ifdef TARGET_OS_ARCH_linux_mips
1.31 +# include "globals_linux_mips.hpp"
1.32 +#endif
1.33 #ifdef TARGET_OS_ARCH_linux_zero
1.34 # include "globals_linux_zero.hpp"
1.35 #endif
1.36 @@ -107,6 +119,9 @@
1.37 #ifdef TARGET_ARCH_sparc
1.38 # include "c1_globals_sparc.hpp"
1.39 #endif
1.40 +#ifdef TARGET_ARCH_mips
1.41 +# include "c1_globals_mips.hpp"
1.42 +#endif
1.43 #ifdef TARGET_ARCH_arm
1.44 # include "c1_globals_arm.hpp"
1.45 #endif
1.46 @@ -136,6 +151,9 @@
1.47 #ifdef TARGET_ARCH_sparc
1.48 # include "c2_globals_sparc.hpp"
1.49 #endif
1.50 +#ifdef TARGET_ARCH_mips
1.51 +# include "c2_globals_mips.hpp"
1.52 +#endif
1.53 #ifdef TARGET_ARCH_arm
1.54 # include "c2_globals_arm.hpp"
1.55 #endif
1.56 @@ -557,9 +575,28 @@
1.57 develop(bool, TracePageSizes, false, \
1.58 "Trace page size selection and usage") \
1.59 \
1.60 - product(bool, UseNUMA, false, \
1.61 + /* 2013/12/18 Jin: disable UseNUMA until OS is fixed*/ \
1.62 + product(bool, UseNUMA, MIPS64_ONLY(false) NOT_MIPS64(false), \
1.63 "Use NUMA if available") \
1.64 \
1.65 + product(bool, UseOldNUMA, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.66 + "Use Old NUMA if available") \
1.67 + \
1.68 + product(bool, UseNUMAThreadRoots, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.69 + "Use NUMAThreadRoots if available") \
1.70 + \
1.71 + product(bool, UseNUMASteal, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.72 + "Use NUMASteal if available") \
1.73 + \
1.74 + product(bool, UseNUMAGC, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.75 + "Use NUMAGC if available") \
1.76 + \
1.77 + product(bool, UseStasticScavenge, false, \
1.78 + "Use StasticScavenge if available") \
1.79 + \
1.80 + product(bool, UseStasticCopy, false, \
1.81 + "Use StasticCopy if available") \
1.82 + \
1.83 product(bool, UseNUMAInterleaving, false, \
1.84 "Interleave memory across NUMA nodes if available") \
1.85 \
1.86 @@ -2257,7 +2294,7 @@
1.87 diagnostic(uintx, CPUForCMSThread, 0, \
1.88 "When BindCMSThreadToCPU is true, the CPU to bind CMS thread to") \
1.89 \
1.90 - product(bool, BindGCTaskThreadsToCPUs, false, \
1.91 + product(bool, BindGCTaskThreadsToCPUs, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.92 "Bind GCTaskThreads to CPUs if possible") \
1.93 \
1.94 product(bool, UseGCTaskAffinity, false, \
1.95 @@ -3103,10 +3140,10 @@
1.96 "Number of times to spin wait before inflation") \
1.97 \
1.98 /* gc parameters */ \
1.99 - product(uintx, InitialHeapSize, 0, \
1.100 + product(uintx, InitialHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(0) *M), \
1.101 "Initial heap size (in bytes); zero means use ergonomics") \
1.102 \
1.103 - product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \
1.104 + product(uintx, MaxHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(96) *M), \
1.105 "Maximum heap size (in bytes)") \
1.106 \
1.107 product(uintx, OldSize, ScaleForWordSize(4*M), \
