Mercurial > hg > graal-compiler
diff src/share/vm/utilities/globalDefinitions.hpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | cefad50507d8 |
children | 36b1f3224948 |
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions.hpp Fri Oct 11 10:38:03 2013 +0200 +++ b/src/share/vm/utilities/globalDefinitions.hpp Fri Oct 11 15:41:33 2013 +0200 @@ -809,20 +809,20 @@ CompLevel_full_profile = 3, // C1, invocation & backedge counters + mdo CompLevel_full_optimization = 4, // C2 or Shark -#if defined(COMPILER2) || defined(SHARK) - CompLevel_highest_tier = CompLevel_full_optimization, // pure C2 and tiered -#elif defined(COMPILER1) || defined(GRAAL) - CompLevel_highest_tier = CompLevel_simple, // pure C1 or Graal +#if defined(COMPILER2) || defined(SHARK) || defined(GRAAL) + CompLevel_highest_tier = CompLevel_full_optimization, // pure C2, tiered or pure Graal +#elif defined(COMPILER1) + CompLevel_highest_tier = CompLevel_simple, // pure C1 #else CompLevel_highest_tier = CompLevel_none, #endif #if defined(TIERED) CompLevel_initial_compile = CompLevel_full_profile // tiered -#elif defined(COMPILER1) || defined(GRAAL) - CompLevel_initial_compile = CompLevel_simple // pure C1 or Graal -#elif defined(COMPILER2) || defined(SHARK) - CompLevel_initial_compile = CompLevel_full_optimization // pure C2 +#elif defined(COMPILER1) + CompLevel_initial_compile = CompLevel_simple // pure C1 +#elif defined(COMPILER2) || defined(SHARK) || defined(GRAAL) + CompLevel_initial_compile = CompLevel_full_optimization // pure C2 or pure Graal #else CompLevel_initial_compile = CompLevel_none #endif