[llvm-commits] CVS: reopt/lib/LightWtProfiling/FirstTrigger.cpp Globals.h Initialization.cpp RuntimeOptimizations.cpp SLI.cpp SLI.h SecondTrigger.cpp SecondTrigger.h Timer.cpp Trace.cpp Trace.h TraceToFunction.cpp TraceToFunction.h UnpackTraceFunction.cpp scheduler.cpp
Brian Gaeke
gaeke at cs.uiuc.edu
Wed Nov 19 16:53:21 PST 2003
Changes in directory reopt/lib/LightWtProfiling:
FirstTrigger.cpp updated: 1.15 -> 1.16
Globals.h updated: 1.5 -> 1.6
Initialization.cpp updated: 1.10 -> 1.11
RuntimeOptimizations.cpp updated: 1.10 -> 1.11
SLI.cpp updated: 1.10 -> 1.11
SLI.h updated: 1.1 -> 1.2
SecondTrigger.cpp updated: 1.23 -> 1.24
SecondTrigger.h updated: 1.3 -> 1.4
Timer.cpp updated: 1.3 -> 1.4
Trace.cpp updated: 1.2 -> 1.3
Trace.h updated: 1.6 -> 1.7
TraceToFunction.cpp updated: 1.15 -> 1.16
TraceToFunction.h updated: 1.1 -> 1.2
UnpackTraceFunction.cpp updated: 1.21 -> 1.22
scheduler.cpp updated: 1.3 -> 1.4
---
Log message:
Put reoptimizer code into 'llvm' namespace.
Other minor cleanups.
---
Diffs of the changes: (+65 -20)
Index: reopt/lib/LightWtProfiling/FirstTrigger.cpp
diff -u reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.15 reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.16
--- reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.15 Sat Sep 13 16:12:11 2003
+++ reopt/lib/LightWtProfiling/FirstTrigger.cpp Wed Nov 19 16:51:48 2003
@@ -8,7 +8,6 @@
//
//===----------------------------------------------------------------------===//
-#include <cassert>
#include "GetTimer.h"
#include "Globals.h"
#include "SecondTrigger.h"
@@ -20,6 +19,9 @@
#include "reopt/VirtualMem.h"
#include "reopt/InstrUtils.h"
#include "reopt/TraceCache.h"
+#include <cassert>
+
+namespace llvm {
/// This is the function that performs first-level profiling. A call
/// to this function from most back-edges is inserted by the InstLoops
@@ -109,3 +111,5 @@
LOAD_FD_REGS(fd_reg_save);
LOAD_FSR_REG(fsr_reg);
}
+
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/Globals.h
diff -u reopt/lib/LightWtProfiling/Globals.h:1.5 reopt/lib/LightWtProfiling/Globals.h:1.6
--- reopt/lib/LightWtProfiling/Globals.h:1.5 Fri Aug 22 12:43:40 2003
+++ reopt/lib/LightWtProfiling/Globals.h Wed Nov 19 16:51:48 2003
@@ -16,6 +16,8 @@
#include "reopt/VirtualMem.h"
#include "llvm/Module.h"
+namespace llvm {
+
/// Threshold against which back-edge counters are compared in first-level
/// instrumentation. If a back-edge's counter exceeds this threshold, we
/// may generate second-level instrumentation (SLI) for the loop.
@@ -69,5 +71,7 @@
///
extern const unsigned char LLVMBytecode[];
extern int llvm_length;
+
+}
#endif // GLOBALS_H
Index: reopt/lib/LightWtProfiling/Initialization.cpp
diff -u reopt/lib/LightWtProfiling/Initialization.cpp:1.10 reopt/lib/LightWtProfiling/Initialization.cpp:1.11
--- reopt/lib/LightWtProfiling/Initialization.cpp:1.10 Mon Oct 27 13:00:41 2003
+++ reopt/lib/LightWtProfiling/Initialization.cpp Wed Nov 19 16:51:48 2003
@@ -14,6 +14,8 @@
#include "llvm/Bytecode/Reader.h"
#include "reopt/ScratchMemory.h"
+namespace llvm {
+
// Definitions of globals declared extern in Globals.h
int32_t reopt_threshold;
int32_t THRESHOLD_LEVEL_2;
@@ -75,3 +77,5 @@
M = ParseBytecodeBuffer(LLVMBytecode, llvm_length, "NOFILENAME", &err);
assert(M && "Module parsing failed!");
}
+
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp
diff -u reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.10 reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.11
--- reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.10 Mon Nov 3 01:03:30 2003
+++ reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp Wed Nov 19 16:51:48 2003
@@ -17,6 +17,8 @@
#include "llvm/Analysis/Verifier.h"
#include <fstream>
+namespace llvm {
+
// From Initialization.cpp
extern void initModules ();
@@ -67,3 +69,5 @@
void (*p)() = EE->getPointerToFunction (TF);
#endif
}
+
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/SLI.cpp
diff -u reopt/lib/LightWtProfiling/SLI.cpp:1.10 reopt/lib/LightWtProfiling/SLI.cpp:1.11
--- reopt/lib/LightWtProfiling/SLI.cpp:1.10 Thu Oct 30 14:48:39 2003
+++ reopt/lib/LightWtProfiling/SLI.cpp Wed Nov 19 16:51:48 2003
@@ -18,6 +18,8 @@
#include <algorithm>
#include <cassert>
+namespace llvm {
+
extern "C" void llvm_time_end();
extern "C" void llvm_first_trigger();
extern void initModules ();
@@ -590,3 +592,5 @@
doInlining(MI->first, stack, vm);
}
}
+
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/SLI.h
diff -u reopt/lib/LightWtProfiling/SLI.h:1.1 reopt/lib/LightWtProfiling/SLI.h:1.2
--- reopt/lib/LightWtProfiling/SLI.h:1.1 Wed Aug 6 16:48:30 2003
+++ reopt/lib/LightWtProfiling/SLI.h Wed Nov 19 16:51:48 2003
@@ -2,8 +2,12 @@
#define SLI_H
#include "Support/DataTypes.h"
-class VirtualMem;
+namespace llvm {
+
+class VirtualMem;
void doInstrumentation(uint64_t addr1, uint64_t addr2, VirtualMem *vm);
+
+} // end namespace llvm
#endif // SLI_H
Index: reopt/lib/LightWtProfiling/SecondTrigger.cpp
diff -u reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.23 reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.24
--- reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.23 Mon Nov 3 01:05:59 2003
+++ reopt/lib/LightWtProfiling/SecondTrigger.cpp Wed Nov 19 16:51:48 2003
@@ -24,6 +24,8 @@
#include <cassert>
#include <libcpc.h>
+namespace llvm {
+
// Keeps a pointer to a map from branch histories to the number of
// times we reached countPath for that particular branch history:
static std::map<uint64_t, std::map<uint64_t, int> *> pathCounter;
@@ -920,3 +922,5 @@
index += 6;
}
+
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/SecondTrigger.h
diff -u reopt/lib/LightWtProfiling/SecondTrigger.h:1.3 reopt/lib/LightWtProfiling/SecondTrigger.h:1.4
--- reopt/lib/LightWtProfiling/SecondTrigger.h:1.3 Thu Oct 30 23:36:09 2003
+++ reopt/lib/LightWtProfiling/SecondTrigger.h Wed Nov 19 16:51:48 2003
@@ -7,9 +7,11 @@
#ifndef SECONDTRIGGER_H
#define SECONDTRIGGER_H
+#include "Support/DataTypes.h"
#include <map>
#include <vector>
-#include "Support/DataTypes.h"
+
+namespace llvm {
extern std::map<uint64_t, uint64_t> firstTriggerAddr;
@@ -29,5 +31,7 @@
uint32_t scanForBranch (const uint64_t startAddr, uint64_t &foundAddr);
void countPath ();
+
+} // end namespace llvm
#endif // SECONDTRIGGER_H
Index: reopt/lib/LightWtProfiling/Timer.cpp
diff -u reopt/lib/LightWtProfiling/Timer.cpp:1.3 reopt/lib/LightWtProfiling/Timer.cpp:1.4
--- reopt/lib/LightWtProfiling/Timer.cpp:1.3 Wed Sep 10 13:47:14 2003
+++ reopt/lib/LightWtProfiling/Timer.cpp Wed Nov 19 16:51:49 2003
@@ -6,6 +6,8 @@
#include <csignal>
#include <iostream>
+namespace llvm {
+
extern "C" void do_timer_interval();
uint64_t llvm_interval_counter;
@@ -79,21 +81,10 @@
//set timer
timer_settime(timer_id, 0, &timer_spec, &old_timer_spec);
-
- //nvec = (struct sigaction*)malloc(sizeof(struct sigaction));
- //ovec = (struct sigaction*)malloc(sizeof(struct sigaction));
-
- // stuct sigvec nvec = new sigvec;
- //sigvec ovec = new sigvec;
+
+ // Set up signal handler for SIGUSR2.
signal(SIGUSR2, &timer_handler);
- /*
- nvec->sa_handler = timer_handler;
-
- sigaction(SIGUSR2, nvec, ovec);
- sigemptyset(&sig_usr2);
- sigemptyset(&sig_old);
- sigfillset(&sig_all);
- sigaddset(&sig_usr2, SIGUSR2);
- */
return 1;
}
+
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/Trace.cpp
diff -u reopt/lib/LightWtProfiling/Trace.cpp:1.2 reopt/lib/LightWtProfiling/Trace.cpp:1.3
--- reopt/lib/LightWtProfiling/Trace.cpp:1.2 Tue Aug 19 14:23:10 2003
+++ reopt/lib/LightWtProfiling/Trace.cpp Wed Nov 19 16:51:49 2003
@@ -10,6 +10,8 @@
#include "llvm/Assembly/Writer.h"
#include <iostream>
+using namespace llvm;
+
/// print - Write trace to output stream.
///
void Trace::print (std::ostream &O) const {
Index: reopt/lib/LightWtProfiling/Trace.h
diff -u reopt/lib/LightWtProfiling/Trace.h:1.6 reopt/lib/LightWtProfiling/Trace.h:1.7
--- reopt/lib/LightWtProfiling/Trace.h:1.6 Mon Oct 13 12:59:09 2003
+++ reopt/lib/LightWtProfiling/Trace.h Wed Nov 19 16:51:49 2003
@@ -11,6 +11,8 @@
#include "llvm/Function.h"
#include <iosfwd>
+namespace llvm {
+
class Trace {
typedef std::vector<BasicBlock *> BasicBlockListType;
BasicBlockListType BasicBlocks;
@@ -85,5 +87,7 @@
bool dominates (const BasicBlock *B1, const BasicBlock *B2,
const BasicBlock *start = 0);
};
+
+} // end namespace llvm
#endif // TRACE_H
Index: reopt/lib/LightWtProfiling/TraceToFunction.cpp
diff -u reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.15 reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.16
--- reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.15 Sun Nov 9 17:48:22 2003
+++ reopt/lib/LightWtProfiling/TraceToFunction.cpp Wed Nov 19 16:51:49 2003
@@ -35,6 +35,8 @@
#include "Support/Debug.h" // for DEBUG()
#include <cassert>
+namespace llvm {
+
typedef std::vector<const Type *> TypeVector;
typedef std::map<Value *, unsigned int> ValueToIntMap;
typedef std::map<const Value *, Value *> ValueMap;
@@ -536,9 +538,10 @@
// branches.
DEBUG(if (BranchInst *BrI = dyn_cast<BranchInst> (&I)) {
for (unsigned i = 0; i < BrI->getNumSuccessors (); ++i) {
- assert (BrI->getSuccessor (i)->getParent () == F
+ BasicBlock *succ = BrI->getSuccessor (i);
+ assert (succ->getParent () == F
&& "Branch out of function missed by copyTraceToFunction");
- assert (!O2CMap[BrI->getSuccessor (i)]
+ assert (O2CMap.find (succ) == O2CMap.end ()
&& "Branch's clone found as key in original-->clone map; "
"no one told me today was opposite day!");
}
@@ -574,3 +577,4 @@
return TTF.traceToFunction (T);
}
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/TraceToFunction.h
diff -u reopt/lib/LightWtProfiling/TraceToFunction.h:1.1 reopt/lib/LightWtProfiling/TraceToFunction.h:1.2
--- reopt/lib/LightWtProfiling/TraceToFunction.h:1.1 Mon Nov 3 00:56:37 2003
+++ reopt/lib/LightWtProfiling/TraceToFunction.h Wed Nov 19 16:51:49 2003
@@ -11,6 +11,9 @@
#include "llvm/Function.h"
#include <set>
#include <map>
+
+namespace llvm {
+
class Trace;
typedef std::set<Value *> LiveVariableSet;
@@ -21,5 +24,7 @@
/// runTraceToFunction - Entry point for TraceToFunction transformation.
///
Function *runTraceToFunction (Trace &T);
+
+} // end namespace llvm
#endif // TRACETOFUNCTION_H
Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.21 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.22
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.21 Sun Nov 9 17:48:50 2003
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp Wed Nov 19 16:51:49 2003
@@ -15,6 +15,8 @@
#include "llvm/Module.h"
#include "reopt/MappingInfo.h"
+namespace llvm {
+
/// Insert the appropriate machine instruction(s) that copies the value in
/// Source to the location specified by Target, at the beginning of B. Note
/// that the current implementation is SPARC-specific.
@@ -261,3 +263,4 @@
}
}
+} // end namespace llvm
Index: reopt/lib/LightWtProfiling/scheduler.cpp
diff -u reopt/lib/LightWtProfiling/scheduler.cpp:1.3 reopt/lib/LightWtProfiling/scheduler.cpp:1.4
--- reopt/lib/LightWtProfiling/scheduler.cpp:1.3 Wed Sep 10 15:35:55 2003
+++ reopt/lib/LightWtProfiling/scheduler.cpp Wed Nov 19 16:51:49 2003
@@ -4,6 +4,8 @@
#include "reopt/InstrUtils.h"
#include <queue>
+namespace llvm {
+
class priority_queue_entry
{
public:
@@ -85,3 +87,5 @@
unmask_interrupt();
return 0;
}
+
+} // end namespace llvm
More information about the llvm-commits
mailing list