[llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp

[Brian Gaeke]

Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

Initialization.cpp updated: 1.3 -> 1.4

---
Log message:

Turn off command line options that try to use
external storage for now, until we can figure out why they always
fail asserts :-(


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp:1.3 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp:1.4
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp:1.3	Mon Aug 18 22:59:48 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp	Tue Aug 19 14:18:31 2003
@@ -25,18 +25,13 @@
 Module *M;
 bool count_trace_cycles;
 
+#define USE_CL_EXTERNAL_OPTS 0
+
 // Command line options. Use these to set the global variables.  For
 // now the reoptimizer code references the global variables
 // explicitly.  When the reoptimizer is encapsulated into an object,
 // we can just use the object's constructor to copy these values into
 // fields of the object.
-cl::opt<int32_t, true>
-FLIThreshold("fli-threshold", cl::init(DEFAULT_THRESHOLD_LEVEL_1),
-	     cl::location(reopt_threshold));
-
-cl::opt<int32_t, true>
-SLIThreshold("sli-threshold", cl::init(DEFAULT_THRESHOLD_LEVEL_2),
-	     cl::location(THRESHOLD_LEVEL_2));
 
 // FIXME: What are the units of these next two?
 // Size of trace cache used for SLI-instrumented code
@@ -49,9 +44,19 @@
 OptTraceCacheSize("opt-trace-cache-size",
 		  cl::init(30000));
 
+#if USE_CL_EXTERNAL_OPTS
+cl::opt<int32_t, true>
+FLIThreshold("fli-threshold", cl::init(DEFAULT_THRESHOLD_LEVEL_1),
+	     cl::location(reopt_threshold));
+
+cl::opt<int32_t, true>
+SLIThreshold("sli-threshold", cl::init(DEFAULT_THRESHOLD_LEVEL_2),
+	     cl::location(THRESHOLD_LEVEL_2));
+
 cl::opt<bool, true>
 CountTraceCycles("count-trace-cycles", cl::init(false),
 		 cl::location(count_trace_cycles));
+#endif
 	    
 /// reoptimizerInitialize - Initialization method for the
 /// reoptimizer. A call to this function from main() is inserted by
@@ -69,6 +74,11 @@
 
   // FIXME: When do we need to call this?
   //initialize_timer();
+#if !USE_CL_EXTERNAL_OPTS
+  reopt_threshold = DEFAULT_THRESHOLD_LEVEL_1;
+  THRESHOLD_LEVEL_2 = DEFAULT_THRESHOLD_LEVEL_2;
+  count_trace_cycles = false;
+#endif
 }
 
 /// Initialization method for the reoptimizer that parses the bytecode