graal-compiler: src/share/vm/runtime/arguments.cpp comparison

comparison src/share/vm/runtime/arguments.cpp @ 1805:a25394352030

Merge

author	kamg
date	Wed, 22 Sep 2010 12:54:51 -0400
parents	728a287f6c20 18c378513575
children	22e4420d19f7 dfb38ea7da17

comparison

equal deleted inserted replaced

-:2966dab85b3e
+:a25394352030
 // These parameters are reset in method parse_vm_init_args(JavaVMInitArgs*)
 bool   Arguments::_AlwaysCompileLoopMethods     = AlwaysCompileLoopMethods;
 bool   Arguments::_UseOnStackReplacement        = UseOnStackReplacement;
 bool   Arguments::_BackgroundCompilation        = BackgroundCompilation;
 bool   Arguments::_ClipInlining                 = ClipInlining;
-intx   Arguments::_Tier2CompileThreshold        = Tier2CompileThreshold;
 char*  Arguments::SharedArchivePath             = NULL;
 AgentLibraryList Arguments::_libraryList;
 AgentLibraryList Arguments::_agentList;
 // use the saved values
 ClipInlining               = Arguments::_ClipInlining;
 AlwaysCompileLoopMethods   = Arguments::_AlwaysCompileLoopMethods;
 UseOnStackReplacement      = Arguments::_UseOnStackReplacement;
 BackgroundCompilation      = Arguments::_BackgroundCompilation;
-Tier2CompileThreshold      = Arguments::_Tier2CompileThreshold;
 // Change from defaults based on mode
 switch (mode) {
 default:
 ShouldNotReachHere();
 jio_fprintf(defaultStream::error_stream(),
 "Class data sharing is inconsistent with other specified options.\n");
 vm_exit_during_initialization("Unable to use shared archive.", NULL);
 } else {
 FLAG_SET_DEFAULT(UseSharedSpaces, false);
+}
+}
+void Arguments::set_tiered_flags() {
+if (FLAG_IS_DEFAULT(CompilationPolicyChoice)) {
+FLAG_SET_DEFAULT(CompilationPolicyChoice, 2);
+}
+if (CompilationPolicyChoice < 2) {
+vm_exit_during_initialization(
+"Incompatible compilation policy selected", NULL);
+}
+#ifdef _LP64
+if (FLAG_IS_DEFAULT(UseCompressedOops) || FLAG_IS_ERGO(UseCompressedOops)) {
+UseCompressedOops = false;
+}
+if (UseCompressedOops) {
+vm_exit_during_initialization(
+"Tiered compilation is not supported with compressed oops yet", NULL);
+}
+#endif
+// Increase the code cache size - tiered compiles a lot more.
+if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
+FLAG_SET_DEFAULT(ReservedCodeCacheSize, ReservedCodeCacheSize * 2);
 }
 }
 #ifndef KERNEL
 // If the user has chosen ParallelGCThreads > 0, we set UseParNewGC
 }
 return true;
 }
 inline uintx max_heap_for_compressed_oops() {
-LP64_ONLY(return OopEncodingHeapMax - MaxPermSize - os::vm_page_size());
+// Heap should be above HeapBaseMinAddress to get zero based compressed oops.
+LP64_ONLY(return OopEncodingHeapMax - MaxPermSize - os::vm_page_size() - HeapBaseMinAddress);
 NOT_LP64(ShouldNotReachHere(); return 0);
 }
 bool Arguments::should_auto_select_low_pause_collector() {
 if (UseAutoGCSelectPolicy &&
 #ifndef ZERO
 #ifdef _LP64
 // Check that UseCompressedOops can be set with the max heap size allocated
 // by ergonomics.
 if (MaxHeapSize <= max_heap_for_compressed_oops()) {
-#ifndef COMPILER1
+#if !defined(COMPILER1) || defined(TIERED)
 if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
 FLAG_SET_ERGO(bool, UseCompressedOops, true);
 }
 #endif
 #ifdef _WIN64
 // Save default settings for some mode flags
 Arguments::_AlwaysCompileLoopMethods = AlwaysCompileLoopMethods;
 Arguments::_UseOnStackReplacement    = UseOnStackReplacement;
 Arguments::_ClipInlining             = ClipInlining;
 Arguments::_BackgroundCompilation    = BackgroundCompilation;
-Arguments::_Tier2CompileThreshold    = Tier2CompileThreshold;
 // Parse JAVA_TOOL_OPTIONS environment variable (if present)
 jint result = parse_java_tool_options_environment_variable(&scp, &scp_assembly_required);
 if (result != JNI_OK) {
 return result;
 }
 if (CompileThreshold == 0) {
 set_mode_flags(_int);
 }
-#ifdef TIERED
-// If we are using tiered compilation in the tiered vm then c1 will
-// do the profiling and we don't want to waste that time in the
-// interpreter.
-if (TieredCompilation) {
-ProfileInterpreter = false;
-} else {
-// Since we are running vanilla server we must adjust the compile threshold
-// unless the user has already adjusted it because the default threshold assumes
-// we will run tiered.
-if (FLAG_IS_DEFAULT(CompileThreshold)) {
-CompileThreshold = Tier2CompileThreshold;
-}
-}
-#endif // TIERED
 #ifndef COMPILER2
 // Don't degrade server performance for footprint
 if (FLAG_IS_DEFAULT(UseLargePages) &&
 MaxHeapSize < LargePageHeapSizeThreshold) {
 // No need for large granularity pages w/small heaps.
 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseISM, false));
 }
 // Tiered compilation is undefined with C1.
 TieredCompilation = false;
 #else
 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) {
 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1);
 }
 // Temporary disable bulk zeroing reduction with G1. See CR 6627983.
 if (PrintGCDetails) {
 // Turn on -verbose:gc options as well
 PrintGC = true;
 }
-#if defined(_LP64) && defined(COMPILER1)
+#if defined(_LP64) && defined(COMPILER1) && !defined(TIERED)
 UseCompressedOops = false;
 #endif
 // Set object alignment values.
 set_object_alignment();
 #endif // _LP64
 // Check the GC selections again.
 if (!check_gc_consistency()) {
 return JNI_EINVAL;
+}
+if (TieredCompilation) {
+set_tiered_flags();
+} else {
+// Check if the policy is valid. Policies 0 and 1 are valid for non-tiered setup.
+if (CompilationPolicyChoice >= 2) {
+vm_exit_during_initialization(
+"Incompatible compilation policy selected", NULL);
+}
 }
 #ifndef KERNEL
 if (UseConcMarkSweepGC) {
 // Set flags for CMS and ParNew.  Check UseConcMarkSweep first

Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/arguments.cpp @ 1805:a25394352030