Mercurial > hg > graal-jvmci-8
changeset 22495:740feb10d15a
rename jvmciGlobals to be consistent with c1_globals and c2_globals
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Mon, 31 Aug 2015 11:13:32 -0700 |
| parents | 88ab6f037ef2 |
| children | 90c4254dc25a |
| files | src/cpu/sparc/vm/jvmciGlobals_sparc.hpp src/cpu/sparc/vm/jvmci_globals_sparc.hpp src/cpu/x86/vm/jvmciGlobals_x86.hpp src/cpu/x86/vm/jvmci_globals_x86.hpp src/share/vm/jvmci/jvmciGlobals.cpp src/share/vm/jvmci/jvmciGlobals.hpp src/share/vm/jvmci/jvmci_globals.cpp src/share/vm/jvmci/jvmci_globals.hpp src/share/vm/precompiled/precompiled.hpp src/share/vm/runtime/globals.cpp src/share/vm/runtime/globals.hpp src/share/vm/utilities/top.hpp |
| diffstat | 12 files changed, 288 insertions(+), 288 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/jvmciGlobals_sparc.hpp Mon Aug 31 11:03:06 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef CPU_SPARC_VM_JVMCIGLOBALS_SPARC_HPP -#define CPU_SPARC_VM_JVMCIGLOBALS_SPARC_HPP - -#include "utilities/globalDefinitions.hpp" -#include "utilities/macros.hpp" - -// Sets the default values for platform dependent flags used by the JVMCI compiler. -// (see jvmciGlobals.hpp) - -#ifdef COMPILERJVMCI -define_pd_global(bool, BackgroundCompilation, true ); -define_pd_global(bool, UseTLAB, true ); -define_pd_global(bool, ResizeTLAB, true ); -define_pd_global(bool, InlineIntrinsics, true ); -define_pd_global(bool, PreferInterpreterNativeStubs, false); -define_pd_global(bool, TieredCompilation, trueInTiered); -define_pd_global(intx, BackEdgeThreshold, 100000); - -define_pd_global(intx, OnStackReplacePercentage, 933 ); -define_pd_global(intx, FreqInlineSize, 325 ); -define_pd_global(intx, NewSizeThreadIncrease, 4*K ); -define_pd_global(uintx,MetaspaceSize, 12*M ); -define_pd_global(bool, NeverActAsServerClassMachine, false); -define_pd_global(uint64_t,MaxRAM, 128ULL*G); -define_pd_global(bool, CICompileOSR, true ); -define_pd_global(bool, ProfileTraps, true ); -define_pd_global(bool, UseOnStackReplacement, true ); -define_pd_global(intx, CompileThreshold, 10000); -define_pd_global(intx, InitialCodeCacheSize, 16*M ); -define_pd_global(intx, ReservedCodeCacheSize, 64*M ); -define_pd_global(bool, ProfileInterpreter, true ); -define_pd_global(intx, CodeCacheExpansionSize, 64*K ); -define_pd_global(uintx,CodeCacheMinBlockLength, 4); -define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K); -define_pd_global(intx, TypeProfileWidth, 8); -define_pd_global(intx, MethodProfileWidth, 0); -#endif // COMPILERJVMCI - -define_pd_global(intx, MaxVectorSize, 8); - -#endif // CPU_SPARC_VM_JVMCIGLOBALS_SPARC_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/sparc/vm/jvmci_globals_sparc.hpp Mon Aug 31 11:13:32 2015 -0700 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_SPARC_VM_JVMCI_GLOBALS_SPARC_HPP +#define CPU_SPARC_VM_JVMCI_GLOBALS_SPARC_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + +// Sets the default values for platform dependent flags used by the JVMCI compiler. +// (see jvmci_globals.hpp) + +#ifdef COMPILERJVMCI +define_pd_global(bool, BackgroundCompilation, true ); +define_pd_global(bool, UseTLAB, true ); +define_pd_global(bool, ResizeTLAB, true ); +define_pd_global(bool, InlineIntrinsics, true ); +define_pd_global(bool, PreferInterpreterNativeStubs, false); +define_pd_global(bool, TieredCompilation, trueInTiered); +define_pd_global(intx, BackEdgeThreshold, 100000); + +define_pd_global(intx, OnStackReplacePercentage, 933 ); +define_pd_global(intx, FreqInlineSize, 325 ); +define_pd_global(intx, NewSizeThreadIncrease, 4*K ); +define_pd_global(uintx,MetaspaceSize, 12*M ); +define_pd_global(bool, NeverActAsServerClassMachine, false); +define_pd_global(uint64_t,MaxRAM, 128ULL*G); +define_pd_global(bool, CICompileOSR, true ); +define_pd_global(bool, ProfileTraps, true ); +define_pd_global(bool, UseOnStackReplacement, true ); +define_pd_global(intx, CompileThreshold, 10000); +define_pd_global(intx, InitialCodeCacheSize, 16*M ); +define_pd_global(intx, ReservedCodeCacheSize, 64*M ); +define_pd_global(bool, ProfileInterpreter, true ); +define_pd_global(intx, CodeCacheExpansionSize, 64*K ); +define_pd_global(uintx,CodeCacheMinBlockLength, 4); +define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K); +define_pd_global(intx, TypeProfileWidth, 8); +define_pd_global(intx, MethodProfileWidth, 0); +#endif // COMPILERJVMCI + +define_pd_global(intx, MaxVectorSize, 8); + +#endif // CPU_SPARC_VM_JVMCI_GLOBALS_SPARC_HPP
--- a/src/cpu/x86/vm/jvmciGlobals_x86.hpp Mon Aug 31 11:03:06 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef CPU_X86_VM_JVMCIGLOBALS_X86_HPP -#define CPU_X86_VM_JVMCIGLOBALS_X86_HPP - -#include "utilities/globalDefinitions.hpp" -#include "utilities/macros.hpp" - -// Sets the default values for platform dependent flags used by the JVMCI compiler. -// (see jvmciGlobals.hpp) - -#ifdef COMPILERJVMCI -define_pd_global(bool, BackgroundCompilation, true ); -define_pd_global(bool, UseTLAB, true ); -define_pd_global(bool, ResizeTLAB, true ); -define_pd_global(bool, InlineIntrinsics, true ); -define_pd_global(bool, PreferInterpreterNativeStubs, false); -define_pd_global(bool, TieredCompilation, trueInTiered); -define_pd_global(intx, BackEdgeThreshold, 100000); - -define_pd_global(intx, OnStackReplacePercentage, 933 ); -define_pd_global(intx, FreqInlineSize, 325 ); -define_pd_global(intx, NewSizeThreadIncrease, 4*K ); -define_pd_global(uintx,MetaspaceSize, 12*M ); -define_pd_global(bool, NeverActAsServerClassMachine, false); -define_pd_global(uint64_t,MaxRAM, 128ULL*G); -define_pd_global(bool, CICompileOSR, true ); -define_pd_global(bool, ProfileTraps, true ); -define_pd_global(bool, UseOnStackReplacement, true ); -define_pd_global(intx, CompileThreshold, 10000); -define_pd_global(intx, InitialCodeCacheSize, 16*M ); -define_pd_global(intx, ReservedCodeCacheSize, 64*M ); -define_pd_global(bool, ProfileInterpreter, true ); -define_pd_global(intx, CodeCacheExpansionSize, 64*K ); -define_pd_global(uintx,CodeCacheMinBlockLength, 4); -define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K); -define_pd_global(intx, TypeProfileWidth, 8); -define_pd_global(intx, MethodProfileWidth, 0); -#endif // COMPILERJVMCI - -define_pd_global(intx, MaxVectorSize, 32); - -#endif // CPU_X86_VM_JVMCIGLOBALS_X86_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cpu/x86/vm/jvmci_globals_x86.hpp Mon Aug 31 11:13:32 2015 -0700 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef CPU_X86_VM_JVMCI_GLOBALS_X86_HPP +#define CPU_X86_VM_JVMCI_GLOBALS_X86_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + +// Sets the default values for platform dependent flags used by the JVMCI compiler. +// (see jvmci_globals.hpp) + +#ifdef COMPILERJVMCI +define_pd_global(bool, BackgroundCompilation, true ); +define_pd_global(bool, UseTLAB, true ); +define_pd_global(bool, ResizeTLAB, true ); +define_pd_global(bool, InlineIntrinsics, true ); +define_pd_global(bool, PreferInterpreterNativeStubs, false); +define_pd_global(bool, TieredCompilation, trueInTiered); +define_pd_global(intx, BackEdgeThreshold, 100000); + +define_pd_global(intx, OnStackReplacePercentage, 933 ); +define_pd_global(intx, FreqInlineSize, 325 ); +define_pd_global(intx, NewSizeThreadIncrease, 4*K ); +define_pd_global(uintx,MetaspaceSize, 12*M ); +define_pd_global(bool, NeverActAsServerClassMachine, false); +define_pd_global(uint64_t,MaxRAM, 128ULL*G); +define_pd_global(bool, CICompileOSR, true ); +define_pd_global(bool, ProfileTraps, true ); +define_pd_global(bool, UseOnStackReplacement, true ); +define_pd_global(intx, CompileThreshold, 10000); +define_pd_global(intx, InitialCodeCacheSize, 16*M ); +define_pd_global(intx, ReservedCodeCacheSize, 64*M ); +define_pd_global(bool, ProfileInterpreter, true ); +define_pd_global(intx, CodeCacheExpansionSize, 64*K ); +define_pd_global(uintx,CodeCacheMinBlockLength, 4); +define_pd_global(uintx, CodeCacheMinimumUseSpace, 400*K); +define_pd_global(intx, TypeProfileWidth, 8); +define_pd_global(intx, MethodProfileWidth, 0); +#endif // COMPILERJVMCI + +define_pd_global(intx, MaxVectorSize, 32); + +#endif // CPU_X86_VM_JVMCI_GLOBALS_X86_HPP
--- a/src/share/vm/jvmci/jvmciGlobals.cpp Mon Aug 31 11:03:06 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#include "precompiled.hpp" -#include "jvmci/jvmciGlobals.hpp" - -JVMCI_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, MATERIALIZE_NOTPRODUCT_FLAG)
--- a/src/share/vm/jvmci/jvmciGlobals.hpp Mon Aug 31 11:03:06 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef SHARE_VM_JVMCI_JVMCIGLOBALS_HPP -#define SHARE_VM_JVMCI_JVMCIGLOBALS_HPP - -#include "runtime/globals.hpp" -#ifdef TARGET_ARCH_x86 -# include "jvmciGlobals_x86.hpp" -#endif -#ifdef TARGET_ARCH_sparc -# include "jvmciGlobals_sparc.hpp" -#endif -#ifdef TARGET_ARCH_arm -# include "jvmciGlobals_arm.hpp" -#endif -#ifdef TARGET_ARCH_ppc -# include "jvmciGlobals_ppc.hpp" -#endif - -// -// Defines all global flags used by the JVMCI compiler. Only flags that need -// to be accessible to the JVMCI C++ code should be defined here. All other -// JVMCI flags should be defined in JVMCIOptions.java. -// -#define JVMCI_FLAGS(develop, develop_pd, product, product_pd, notproduct) \ - \ - product(bool, DebugJVMCI, true, \ - "Enable JVMTI for the compiler thread") \ - \ - product(bool, UseJVMCIClassLoader, true, \ - "Load JVMCI classes with separate class loader") \ - \ - product(ccstr, JVMCIServicesDir, NULL, \ - "Alternate directory to use for JVMCI services") \ - \ - COMPILERJVMCI_PRESENT(product(bool, BootstrapJVMCI, false, \ - "Bootstrap JVMCI before running Java main method")) \ - \ - COMPILERJVMCI_PRESENT(product(bool, PrintBootstrap, true, \ - "Print JVMCI bootstrap progress and summary")) \ - \ - COMPILERJVMCI_PRESENT(product(intx, JVMCIThreads, 1, \ - "Force number of JVMCI compiler threads to use")) \ - \ - COMPILERJVMCI_PRESENT(product(intx, JVMCIHostThreads, 1, \ - "Force number of compiler threads for JVMCI host compiler")) \ - \ - JVMCI_ONLY(product(bool, CodeInstallSafepointChecks, true, \ - "Perform explicit safepoint checks while installing code")) \ - \ - NOT_COMPILER2(product_pd(intx, MaxVectorSize, \ - "Max vector size in bytes, " \ - "actual size could be less depending on elements type")) \ - \ - NOT_COMPILER2(product(bool, ReduceInitialCardMarks, true, \ - "Defer write barriers of young objects")) \ - \ - product(intx, TraceJVMCI, 0, \ - "Trace level for JVMCI: " \ - "1 means emit messages for each CompilerToVM call," \ - "levels greater than one provide progressively greater detail") \ - \ - product(intx, JVMCICounterSize, 0, \ - "Reserved size for benchmark counters") \ - \ - product(bool, JVMCICountersExcludeCompiler, true, \ - "Exclude JVMCI compiler threads from benchmark counters") \ - \ - product(bool, JVMCIHProfEnabled, false, \ - "Is Heap Profiler enabled") \ - \ - product(bool, JVMCICompileWithC1Only, true, \ - "Only compile JVMCI classes with C1") \ - \ - product(bool, JVMCICompileAppFirst, false, \ - "Prioritize application compilations over JVMCI compilations") \ - \ - develop(bool, JVMCIUseFastLocking, true, \ - "Use fast inlined locking code") \ - \ - develop(bool, JVMCIUseFastNewTypeArray, true, \ - "Use fast inlined type array allocation") \ - \ - develop(bool, JVMCIUseFastNewObjectArray, true, \ - "Use fast inlined object array allocation") \ - \ - product(intx, JVMCINMethodSizeLimit, (80*K)*wordSize, \ - "Maximum size of a compiled method.") \ - \ - notproduct(bool, JVMCIPrintSimpleStubs, false, \ - "Print simple JVMCI stubs") \ - \ - develop(bool, TraceUncollectedSpeculations, false, \ - "Print message when a failed speculation was not collected") \ - - -// Read default values for JVMCI globals - -JVMCI_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_NOTPRODUCT_FLAG) - -#endif // SHARE_VM_JVMCI_JVMCIGLOBALS_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/vm/jvmci/jvmci_globals.cpp Mon Aug 31 11:13:32 2015 -0700 @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "jvmci/jvmci_globals.hpp" + +JVMCI_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, MATERIALIZE_NOTPRODUCT_FLAG)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/vm/jvmci/jvmci_globals.hpp Mon Aug 31 11:13:32 2015 -0700 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_VM_JVMCI_JVMCI_GLOBALS_HPP +#define SHARE_VM_JVMCI_JVMCI_GLOBALS_HPP + +#include "runtime/globals.hpp" +#ifdef TARGET_ARCH_x86 +# include "jvmci_globals_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "jvmci_globals_sparc.hpp" +#endif +#ifdef TARGET_ARCH_arm +# include "jvmci_globals_arm.hpp" +#endif +#ifdef TARGET_ARCH_ppc +# include "jvmci_globals_ppc.hpp" +#endif + +// +// Defines all global flags used by the JVMCI compiler. Only flags that need +// to be accessible to the JVMCI C++ code should be defined here. All other +// JVMCI flags should be defined in JVMCIOptions.java. +// +#define JVMCI_FLAGS(develop, develop_pd, product, product_pd, notproduct) \ + \ + product(bool, DebugJVMCI, true, \ + "Enable JVMTI for the compiler thread") \ + \ + product(bool, UseJVMCIClassLoader, true, \ + "Load JVMCI classes with separate class loader") \ + \ + product(ccstr, JVMCIServicesDir, NULL, \ + "Alternate directory to use for JVMCI services") \ + \ + COMPILERJVMCI_PRESENT(product(bool, BootstrapJVMCI, false, \ + "Bootstrap JVMCI before running Java main method")) \ + \ + COMPILERJVMCI_PRESENT(product(bool, PrintBootstrap, true, \ + "Print JVMCI bootstrap progress and summary")) \ + \ + COMPILERJVMCI_PRESENT(product(intx, JVMCIThreads, 1, \ + "Force number of JVMCI compiler threads to use")) \ + \ + COMPILERJVMCI_PRESENT(product(intx, JVMCIHostThreads, 1, \ + "Force number of compiler threads for JVMCI host compiler")) \ + \ + JVMCI_ONLY(product(bool, CodeInstallSafepointChecks, true, \ + "Perform explicit safepoint checks while installing code")) \ + \ + NOT_COMPILER2(product_pd(intx, MaxVectorSize, \ + "Max vector size in bytes, " \ + "actual size could be less depending on elements type")) \ + \ + NOT_COMPILER2(product(bool, ReduceInitialCardMarks, true, \ + "Defer write barriers of young objects")) \ + \ + product(intx, TraceJVMCI, 0, \ + "Trace level for JVMCI: " \ + "1 means emit messages for each CompilerToVM call," \ + "levels greater than one provide progressively greater detail") \ + \ + product(intx, JVMCICounterSize, 0, \ + "Reserved size for benchmark counters") \ + \ + product(bool, JVMCICountersExcludeCompiler, true, \ + "Exclude JVMCI compiler threads from benchmark counters") \ + \ + product(bool, JVMCIHProfEnabled, false, \ + "Is Heap Profiler enabled") \ + \ + product(bool, JVMCICompileWithC1Only, true, \ + "Only compile JVMCI classes with C1") \ + \ + product(bool, JVMCICompileAppFirst, false, \ + "Prioritize application compilations over JVMCI compilations") \ + \ + develop(bool, JVMCIUseFastLocking, true, \ + "Use fast inlined locking code") \ + \ + develop(bool, JVMCIUseFastNewTypeArray, true, \ + "Use fast inlined type array allocation") \ + \ + develop(bool, JVMCIUseFastNewObjectArray, true, \ + "Use fast inlined object array allocation") \ + \ + product(intx, JVMCINMethodSizeLimit, (80*K)*wordSize, \ + "Maximum size of a compiled method.") \ + \ + notproduct(bool, JVMCIPrintSimpleStubs, false, \ + "Print simple JVMCI stubs") \ + \ + develop(bool, TraceUncollectedSpeculations, false, \ + "Print message when a failed speculation was not collected") \ + + +// Read default values for JVMCI globals + +JVMCI_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_NOTPRODUCT_FLAG) + +#endif // SHARE_VM_JVMCI_JVMCI_GLOBALS_HPP
--- a/src/share/vm/precompiled/precompiled.hpp Mon Aug 31 11:03:06 2015 -0700 +++ b/src/share/vm/precompiled/precompiled.hpp Mon Aug 31 11:13:32 2015 -0700 @@ -296,7 +296,7 @@ # include "c1/c1_globals.hpp" #endif // COMPILER1 #if INCLUDE_JVMCI -# include "jvmci/jvmciGlobals.hpp" +# include "jvmci/jvmci_globals.hpp" #endif // INCLUDE_JVMCI #if INCLUDE_ALL_GCS # include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
--- a/src/share/vm/runtime/globals.cpp Mon Aug 31 11:03:06 2015 -0700 +++ b/src/share/vm/runtime/globals.cpp Mon Aug 31 11:13:32 2015 -0700 @@ -39,7 +39,7 @@ #include "c1/c1_globals.hpp" #endif #if INCLUDE_JVMCI -#include "jvmci/jvmciGlobals.hpp" +#include "jvmci/jvmci_globals.hpp" #endif #ifdef COMPILER2 #include "opto/c2_globals.hpp"
--- a/src/share/vm/runtime/globals.hpp Mon Aug 31 11:03:06 2015 -0700 +++ b/src/share/vm/runtime/globals.hpp Mon Aug 31 11:13:32 2015 -0700 @@ -131,16 +131,16 @@ #endif #ifdef COMPILERJVMCI #ifdef TARGET_ARCH_x86 -# include "jvmciGlobals_x86.hpp" +# include "jvmci_globals_x86.hpp" #endif #ifdef TARGET_ARCH_sparc -# include "jvmciGlobals_sparc.hpp" +# include "jvmci_globals_sparc.hpp" #endif #ifdef TARGET_ARCH_arm -# include "jvmciGlobals_arm.hpp" +# include "jvmci_globals_arm.hpp" #endif #ifdef TARGET_ARCH_ppc -# include "jvmciGlobals_ppc.hpp" +# include "jvmci_globals_ppc.hpp" #endif #endif // COMPILERJVMCI #ifdef COMPILER2
--- a/src/share/vm/utilities/top.hpp Mon Aug 31 11:03:06 2015 -0700 +++ b/src/share/vm/utilities/top.hpp Mon Aug 31 11:13:32 2015 -0700 @@ -43,7 +43,7 @@ #include "opto/c2_globals.hpp" #endif #if INCLUDE_JVMCI -#include "jvmci/jvmciGlobals.hpp" +#include "jvmci/jvmci_globals.hpp" #endif // THIS FILE IS INTESIONALLY LEFT EMPTY