1.1 --- a/src/share/vm/c1/c1_globals.hpp Thu Sep 02 11:40:02 2010 -0700
1.2 +++ b/src/share/vm/c1/c1_globals.hpp Fri Sep 03 17:51:07 2010 -0700
1.3 @@ -25,12 +25,6 @@
1.4 //
1.5 // Defines all global flags used by the client compiler.
1.6 //
1.7 -#ifndef TIERED
1.8 - #define NOT_TIERED(x) x
1.9 -#else
1.10 - #define NOT_TIERED(x)
1.11 -#endif
1.12 -
1.13 #define C1_FLAGS(develop, develop_pd, product, product_pd, notproduct) \
1.14 \
1.15 /* Printing */ \
1.16 @@ -55,7 +49,7 @@
1.17 notproduct(bool, PrintIRDuringConstruction, false, \
1.18 "Print IR as it's being constructed (helpful for debugging frontend)")\
1.19 \
1.20 - notproduct(bool, PrintPhiFunctions, false, \
1.21 + notproduct(bool, PrintPhiFunctions, false, \
1.22 "Print phi functions when they are created and simplified") \
1.23 \
1.24 notproduct(bool, PrintIR, false, \
1.25 @@ -279,41 +273,29 @@
1.26 product_pd(intx, SafepointPollOffset, \
1.27 "Offset added to polling address (Intel only)") \
1.28 \
1.29 - product(bool, UseNewFeature1, false, \
1.30 - "Enable new feature for testing. This is a dummy flag.") \
1.31 - \
1.32 - product(bool, UseNewFeature2, false, \
1.33 - "Enable new feature for testing. This is a dummy flag.") \
1.34 - \
1.35 - product(bool, UseNewFeature3, false, \
1.36 - "Enable new feature for testing. This is a dummy flag.") \
1.37 - \
1.38 - product(bool, UseNewFeature4, false, \
1.39 - "Enable new feature for testing. This is a dummy flag.") \
1.40 - \
1.41 develop(bool, ComputeExactFPURegisterUsage, true, \
1.42 "Compute additional live set for fpu registers to simplify fpu stack merge (Intel only)") \
1.43 \
1.44 - product(bool, Tier1ProfileCalls, true, \
1.45 + product(bool, C1ProfileCalls, true, \
1.46 "Profile calls when generating code for updating MDOs") \
1.47 \
1.48 - product(bool, Tier1ProfileVirtualCalls, true, \
1.49 + product(bool, C1ProfileVirtualCalls, true, \
1.50 "Profile virtual calls when generating code for updating MDOs") \
1.51 \
1.52 - product(bool, Tier1ProfileInlinedCalls, true, \
1.53 + product(bool, C1ProfileInlinedCalls, true, \
1.54 "Profile inlined calls when generating code for updating MDOs") \
1.55 \
1.56 - product(bool, Tier1ProfileBranches, true, \
1.57 + product(bool, C1ProfileBranches, true, \
1.58 "Profile branches when generating code for updating MDOs") \
1.59 \
1.60 - product(bool, Tier1ProfileCheckcasts, true, \
1.61 + product(bool, C1ProfileCheckcasts, true, \
1.62 "Profile checkcasts when generating code for updating MDOs") \
1.63 \
1.64 - product(bool, Tier1OptimizeVirtualCallProfiling, true, \
1.65 - "Use CHA and exact type results at call sites when updating MDOs") \
1.66 + product(bool, C1OptimizeVirtualCallProfiling, true, \
1.67 + "Use CHA and exact type results at call sites when updating MDOs")\
1.68 \
1.69 - develop(bool, Tier1CountOnly, false, \
1.70 - "Don't schedule tier 2 compiles. Enter VM only") \
1.71 + product(bool, C1UpdateMethodData, trueInTiered, \
1.72 + "Update methodDataOops in Tier1-generated code") \
1.73 \
1.74 develop(bool, PrintCFGToFile, false, \
1.75 "print control flow graph to a separate file during compilation") \
