Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
807 CompLevel_simple = 1, // C1 | 807 CompLevel_simple = 1, // C1 |
808 CompLevel_limited_profile = 2, // C1, invocation & backedge counters | 808 CompLevel_limited_profile = 2, // C1, invocation & backedge counters |
809 CompLevel_full_profile = 3, // C1, invocation & backedge counters + mdo | 809 CompLevel_full_profile = 3, // C1, invocation & backedge counters + mdo |
810 CompLevel_full_optimization = 4, // C2 or Shark | 810 CompLevel_full_optimization = 4, // C2 or Shark |
811 | 811 |
812 #if defined(COMPILER2) || defined(SHARK) | 812 #if defined(COMPILER2) || defined(SHARK) || defined(GRAAL) |
813 CompLevel_highest_tier = CompLevel_full_optimization, // pure C2 and tiered | 813 CompLevel_highest_tier = CompLevel_full_optimization, // pure C2, tiered or pure Graal |
814 #elif defined(COMPILER1) || defined(GRAAL) | 814 #elif defined(COMPILER1) |
815 CompLevel_highest_tier = CompLevel_simple, // pure C1 or Graal | 815 CompLevel_highest_tier = CompLevel_simple, // pure C1 |
816 #else | 816 #else |
817 CompLevel_highest_tier = CompLevel_none, | 817 CompLevel_highest_tier = CompLevel_none, |
818 #endif | 818 #endif |
819 | 819 |
820 #if defined(TIERED) | 820 #if defined(TIERED) |
821 CompLevel_initial_compile = CompLevel_full_profile // tiered | 821 CompLevel_initial_compile = CompLevel_full_profile // tiered |
822 #elif defined(COMPILER1) || defined(GRAAL) | 822 #elif defined(COMPILER1) |
823 CompLevel_initial_compile = CompLevel_simple // pure C1 or Graal | 823 CompLevel_initial_compile = CompLevel_simple // pure C1 |
824 #elif defined(COMPILER2) || defined(SHARK) | 824 #elif defined(COMPILER2) || defined(SHARK) || defined(GRAAL) |
825 CompLevel_initial_compile = CompLevel_full_optimization // pure C2 | 825 CompLevel_initial_compile = CompLevel_full_optimization // pure C2 or pure Graal |
826 #else | 826 #else |
827 CompLevel_initial_compile = CompLevel_none | 827 CompLevel_initial_compile = CompLevel_none |
828 #endif | 828 #endif |
829 }; | 829 }; |
830 | 830 |