*** old/src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.cpp	Thu Mar 29 13:44:30 2018
--- new/src/hotspot/share/runtime/jvmFlagConstraintsCompiler.cpp	Thu Mar 29 13:44:30 2018

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2015, 2018, 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.

*** 24,51 ****
--- 24,53 ----
  
  #include "precompiled.hpp"
  #include "code/relocInfo.hpp"
  #include "compiler/compilerDefinitions.hpp"
  #include "oops/metadata.hpp"
+ #include "runtime/globals_extension.hpp"
  #include "runtime/os.hpp"
  #include "interpreter/invocationCounter.hpp"
  #include "runtime/arguments.hpp"
! #include "runtime/commandLineFlagConstraintsCompiler.hpp"
! #include "runtime/commandLineFlagRangeList.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/globals_extension.hpp"
! #include "runtime/jvmFlagConstraintsCompiler.hpp"
! #include "runtime/jvmFlagRangeList.hpp"
  #include "utilities/defaultStream.hpp"
+ #ifdef COMPILER2
+ #include "opto/c2_globals.hpp"
+ #endif
  
! JVMFlag::Error AliasLevelConstraintFunc(intx value, bool verbose) {
    if ((value <= 1) && (Arguments::mode() == Arguments::_comp || Arguments::mode() == Arguments::_mixed)) {
      CommandLineError::print(verbose,
                              "AliasLevel (" INTX_FORMAT ") is not "
                              "compatible with -Xcomp or -Xmixed\n",
                              value);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    } else {
!     return JVMFlag::SUCCESS;
    }
  }
  
  /**
   * Validate the minimum number of compiler threads needed to run the

*** 60,70 ****
--- 62,72 ----
   *    C1 can be used, so the minimum number of compiler threads is 1.
   * 4) The JVM is build using the compilers and tiered compilation is enabled. The option
   *    'TieredStopAtLevel = CompLevel_full_optimization' (the default value). As a result,
   *    the minimum number of compiler threads is 2.
   */
! JVMFlag::Error CICompilerCountConstraintFunc(intx value, bool verbose) {
    int min_number_of_compiler_threads = 0;
  #if !defined(COMPILER1) && !defined(COMPILER2) && !INCLUDE_JVMCI
    // case 1
  #else
    if (!TieredCompilation || (TieredStopAtLevel < CompLevel_full_optimization)) {

*** 83,161 ****
--- 85,163 ----
    if (value < (intx)min_number_of_compiler_threads) {
      CommandLineError::print(verbose,
                              "CICompilerCount (" INTX_FORMAT ") must be "
                              "at least %d \n",
                              value, min_number_of_compiler_threads);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    } else {
!     return JVMFlag::SUCCESS;
    }
  }
  
! JVMFlag::Error AllocatePrefetchDistanceConstraintFunc(intx value, bool verbose) {
    if (value < 0 || value > 512) {
      CommandLineError::print(verbose,
                              "AllocatePrefetchDistance (" INTX_FORMAT ") must be "
                              "between 0 and " INTX_FORMAT "\n",
                              AllocatePrefetchDistance, 512);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(intx value, bool verbose) {
    if (AllocatePrefetchStyle == 3) {
      if (value % wordSize != 0) {
        CommandLineError::print(verbose,
                                "AllocatePrefetchStepSize (" INTX_FORMAT ") must be multiple of %d\n",
                                value, wordSize);
!       return JVMFlag::VIOLATES_CONSTRAINT;
      }
    }
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error AllocatePrefetchInstrConstraintFunc(intx value, bool verbose) {
    intx max_value = max_intx;
  #if defined(SPARC)
    max_value = 1;
  #elif defined(X86)
    max_value = 3;
  #endif
    if (value < 0 || value > max_value) {
      CommandLineError::print(verbose,
                              "AllocatePrefetchInstr (" INTX_FORMAT ") must be "
                              "between 0 and " INTX_FORMAT "\n", value, max_value);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error CompileThresholdConstraintFunc(intx value, bool verbose) {
    if (value < 0 || value > INT_MAX >> InvocationCounter::count_shift) {
      CommandLineError::print(verbose,
                              "CompileThreshold (" INTX_FORMAT ") "
                              "must be between 0 and %d\n",
                              value,
                              INT_MAX >> InvocationCounter::count_shift);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error OnStackReplacePercentageConstraintFunc(intx value, bool verbose) {
    int backward_branch_limit;
    if (ProfileInterpreter) {
      if (OnStackReplacePercentage < InterpreterProfilePercentage) {
        CommandLineError::print(verbose,
                                "OnStackReplacePercentage (" INTX_FORMAT ") must be "
                                "larger than InterpreterProfilePercentage (" INTX_FORMAT ")\n",
                                OnStackReplacePercentage, InterpreterProfilePercentage);
!       return JVMFlag::VIOLATES_CONSTRAINT;
      }
  
      backward_branch_limit = ((CompileThreshold * (OnStackReplacePercentage - InterpreterProfilePercentage)) / 100)
                              << InvocationCounter::count_shift;
  

*** 165,182 ****
--- 167,184 ----
                                INTX_FORMAT " "
                                "must be between 0 and " INTX_FORMAT ", try changing "
                                "CompileThreshold, InterpreterProfilePercentage, and/or OnStackReplacePercentage\n",
                                (CompileThreshold * (OnStackReplacePercentage - InterpreterProfilePercentage)) / 100,
                                INT_MAX >> InvocationCounter::count_shift);
!       return JVMFlag::VIOLATES_CONSTRAINT;
      }
    } else {
      if (OnStackReplacePercentage < 0 ) {
        CommandLineError::print(verbose,
                                "OnStackReplacePercentage (" INTX_FORMAT ") must be "
                                "non-negative\n", OnStackReplacePercentage);
!       return JVMFlag::VIOLATES_CONSTRAINT;
      }
  
      backward_branch_limit = ((CompileThreshold * OnStackReplacePercentage) / 100)
                              << InvocationCounter::count_shift;
  

*** 185,366 ****
--- 187,368 ----
                                "CompileThreshold * OnStackReplacePercentage / 100 = " INTX_FORMAT " "
                                "must be between 0 and " INTX_FORMAT ", try changing "
                                "CompileThreshold and/or OnStackReplacePercentage\n",
                                (CompileThreshold * OnStackReplacePercentage) / 100,
                                INT_MAX >> InvocationCounter::count_shift);
!       return JVMFlag::VIOLATES_CONSTRAINT;
      }
    }
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error CodeCacheSegmentSizeConstraintFunc(uintx value, bool verbose) {
    if (CodeCacheSegmentSize < (uintx)CodeEntryAlignment) {
      CommandLineError::print(verbose,
                              "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
                              "larger than or equal to CodeEntryAlignment (" INTX_FORMAT ") "
                              "to align entry points\n",
                              CodeCacheSegmentSize, CodeEntryAlignment);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
    if (CodeCacheSegmentSize < sizeof(jdouble)) {
      CommandLineError::print(verbose,
                              "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
                              "at least " SIZE_FORMAT " to align constants\n",
                              CodeCacheSegmentSize, sizeof(jdouble));
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
  #ifdef COMPILER2
    if (CodeCacheSegmentSize < (uintx)OptoLoopAlignment) {
      CommandLineError::print(verbose,
                              "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
                              "larger than or equal to OptoLoopAlignment (" INTX_FORMAT ") "
                              "to align inner loops\n",
                              CodeCacheSegmentSize, OptoLoopAlignment);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  #endif
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error CompilerThreadPriorityConstraintFunc(intx value, bool verbose) {
  #ifdef SOLARIS
    if ((value < MinimumPriority || value > MaximumPriority) &&
        (value != -1) && (value != -FXCriticalPriority)) {
      CommandLineError::print(verbose,
                              "CompileThreadPriority (" INTX_FORMAT ") must be "
                              "between %d and %d inclusively or -1 (means no change) "
                              "or %d (special value for critical thread class/priority)\n",
                              value, MinimumPriority, MaximumPriority, -FXCriticalPriority);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  #endif
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) {
  #ifdef SPARC
    if (CodeEntryAlignment % relocInfo::addr_unit() != 0) {
      CommandLineError::print(verbose,
                              "CodeEntryAlignment (" INTX_FORMAT ") must be "
                              "multiple of NOP size\n", CodeEntryAlignment);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  #endif
  
    if (!is_power_of_2(value)) {
      CommandLineError::print(verbose,
                              "CodeEntryAlignment (" INTX_FORMAT ") must be "
                              "a power of two\n", CodeEntryAlignment);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
    if (CodeEntryAlignment < 16) {
        CommandLineError::print(verbose,
                                "CodeEntryAlignment (" INTX_FORMAT ") must be "
                                "greater than or equal to %d\n",
                                CodeEntryAlignment, 16);
!       return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error OptoLoopAlignmentConstraintFunc(intx value, bool verbose) {
    if (!is_power_of_2(value)) {
      CommandLineError::print(verbose,
                              "OptoLoopAlignment (" INTX_FORMAT ") "
                              "must be a power of two\n",
                              value);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
    // Relevant on ppc, s390, sparc. Will be optimized where
    // addr_unit() == 1.
    if (OptoLoopAlignment % relocInfo::addr_unit() != 0) {
      CommandLineError::print(verbose,
                              "OptoLoopAlignment (" INTX_FORMAT ") must be "
                              "multiple of NOP size (%d)\n",
                              value, relocInfo::addr_unit());
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error ArraycopyDstPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
    if (value >= 4032) {
      CommandLineError::print(verbose,
                              "ArraycopyDstPrefetchDistance (" UINTX_FORMAT ") must be"
                              "between 0 and 4031\n", value);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error ArraycopySrcPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
    if (value >= 4032) {
      CommandLineError::print(verbose,
                              "ArraycopySrcPrefetchDistance (" UINTX_FORMAT ") must be"
                              "between 0 and 4031\n", value);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error TypeProfileLevelConstraintFunc(uintx value, bool verbose) {
    for (int i = 0; i < 3; i++) {
      if (value % 10 > 2) {
        CommandLineError::print(verbose,
                                "Invalid value (" UINTX_FORMAT ") "
                                "in TypeProfileLevel at position %d\n", value, i);
!       return JVMFlag::VIOLATES_CONSTRAINT;
      }
      value = value / 10;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error InitArrayShortSizeConstraintFunc(intx value, bool verbose) {
    if (value % BytesPerLong != 0) {
!     return JVMFlag::VIOLATES_CONSTRAINT;
    } else {
!     return JVMFlag::SUCCESS;
    }
  }
  
  #ifdef COMPILER2
! JVMFlag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose) {
    if (InteriorEntryAlignment > CodeEntryAlignment) {
      CommandLineError::print(verbose,
                             "InteriorEntryAlignment (" INTX_FORMAT ") must be "
                             "less than or equal to CodeEntryAlignment (" INTX_FORMAT ")\n",
                             InteriorEntryAlignment, CodeEntryAlignment);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
  #ifdef SPARC
    if (InteriorEntryAlignment % relocInfo::addr_unit() != 0) {
      CommandLineError::print(verbose,
                              "InteriorEntryAlignment (" INTX_FORMAT ") must be "
                              "multiple of NOP size\n");
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  #endif
  
    if (!is_power_of_2(value)) {
       CommandLineError::print(verbose,
                               "InteriorEntryAlignment (" INTX_FORMAT ") must be "
                               "a power of two\n", InteriorEntryAlignment);
!      return JVMFlag::VIOLATES_CONSTRAINT;
     }
  
    int minimum_alignment = 16;
  #if defined(SPARC) || (defined(X86) && !defined(AMD64))
    minimum_alignment = 4;

*** 371,407 ****
--- 373,409 ----
    if (InteriorEntryAlignment < minimum_alignment) {
      CommandLineError::print(verbose,
                              "InteriorEntryAlignment (" INTX_FORMAT ") must be "
                              "greater than or equal to %d\n",
                              InteriorEntryAlignment, minimum_alignment);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  
! JVMFlag::Error NodeLimitFudgeFactorConstraintFunc(intx value, bool verbose) {
    if (value < MaxNodeLimit * 2 / 100 || value > MaxNodeLimit * 40 / 100) {
      CommandLineError::print(verbose,
                              "NodeLimitFudgeFactor must be between 2%% and 40%% "
                              "of MaxNodeLimit (" INTX_FORMAT ")\n",
                              MaxNodeLimit);
!     return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   return JVMFlag::SUCCESS;
  }
  #endif // COMPILER2
  
! JVMFlag::Error RTMTotalCountIncrRateConstraintFunc(int value, bool verbose) {
  #if INCLUDE_RTM_OPT
    if (UseRTMLocking && !is_power_of_2(RTMTotalCountIncrRate)) {
      CommandLineError::print(verbose,
                              "RTMTotalCountIncrRate (" INTX_FORMAT
                              ") must be a power of 2, resetting it to 64\n",
                              RTMTotalCountIncrRate);
      FLAG_SET_DEFAULT(RTMTotalCountIncrRate, 64);
    }
  #endif
  
!   return JVMFlag::SUCCESS;
  }