Revert my last series of commits related to Timer and 64-bit atomics. Not all the targets
we care about are capable of supporting it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73993 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp
index 8be9444..bcb27a4 100644
--- a/lib/Support/Timer.cpp
+++ b/lib/Support/Timer.cpp
@@ -112,7 +112,8 @@
}
struct TimeRecord {
- int64_t Elapsed, UserTime, SystemTime, MemUsed;
+ double Elapsed, UserTime, SystemTime;
+ ssize_t MemUsed;
};
static TimeRecord getTimeRecord(bool Start) {
@@ -122,7 +123,7 @@
sys::TimeValue user(0,0);
sys::TimeValue sys(0,0);
- int64_t MemUsed = 0;
+ ssize_t MemUsed = 0;
if (Start) {
MemUsed = getMemUsage();
sys::Process::GetTimeUsage(now,user,sys);
@@ -131,9 +132,9 @@
MemUsed = getMemUsage();
}
- Result.Elapsed = now.seconds() * 1000000 + now.microseconds();
- Result.UserTime = user.seconds() * 1000000 + user.microseconds();
- Result.SystemTime = sys.seconds() * 1000000 + sys.microseconds();
+ Result.Elapsed = now.seconds() + now.microseconds() / 1000000.0;
+ Result.UserTime = user.seconds() + user.microseconds() / 1000000.0;
+ Result.SystemTime = sys.seconds() + sys.microseconds() / 1000000.0;
Result.MemUsed = MemUsed;
return Result;
@@ -182,11 +183,11 @@
/// currently active timers, which will be printed when the timer group prints
///
void Timer::addPeakMemoryMeasurement() {
- int64_t MemUsed = getMemUsage();
+ size_t MemUsed = getMemUsage();
for (std::vector<Timer*>::iterator I = ActiveTimers->begin(),
E = ActiveTimers->end(); I != E; ++I)
- (*I)->PeakMem = std::max((*I)->PeakMem, (int64_t)MemUsed-(*I)->PeakMemBase);
+ (*I)->PeakMem = std::max((*I)->PeakMem, MemUsed-(*I)->PeakMemBase);
}
//===----------------------------------------------------------------------===//
@@ -276,13 +277,12 @@
void Timer::print(const Timer &Total, std::ostream &OS) {
if (Total.UserTime)
- printVal(UserTime / 1000000.0, Total.UserTime / 1000000.0, OS);
+ printVal(UserTime, Total.UserTime, OS);
if (Total.SystemTime)
- printVal(SystemTime / 1000000.0, Total.SystemTime / 1000000.0, OS);
+ printVal(SystemTime, Total.SystemTime, OS);
if (Total.getProcessTime())
- printVal(getProcessTime() / 1000000.0,
- Total.getProcessTime() / 1000000.0, OS);
- printVal(Elapsed / 1000000.0, Total.Elapsed / 1000000.0, OS);
+ printVal(getProcessTime(), Total.getProcessTime(), OS);
+ printVal(Elapsed, Total.Elapsed, OS);
OS << " ";
@@ -355,23 +355,23 @@
if (this != DefaultTimerGroup) {
*OutStream << " Total Execution Time: ";
- printAlignedFP(Total.getProcessTime() / 1000000.0, 4, 5, *OutStream);
+ printAlignedFP(Total.getProcessTime(), 4, 5, *OutStream);
*OutStream << " seconds (";
- printAlignedFP(Total.getWallTime() / 1000000.0, 4, 5, *OutStream);
+ printAlignedFP(Total.getWallTime(), 4, 5, *OutStream);
*OutStream << " wall clock)\n";
}
*OutStream << "\n";
- if (Total.UserTime / 1000000.0)
+ if (Total.UserTime)
*OutStream << " ---User Time---";
- if (Total.SystemTime / 1000000.0)
+ if (Total.SystemTime)
*OutStream << " --System Time--";
- if (Total.getProcessTime() / 1000000.0)
+ if (Total.getProcessTime())
*OutStream << " --User+System--";
*OutStream << " ---Wall Time---";
- if (Total.getMemUsed() / 1000000.0)
+ if (Total.getMemUsed())
*OutStream << " ---Mem---";
- if (Total.getPeakMem() / 1000000.0)
+ if (Total.getPeakMem())
*OutStream << " -PeakMem-";
*OutStream << " --- Name ---\n";
diff --git a/lib/System/Atomic.cpp b/lib/System/Atomic.cpp
index fda2708..6e751a3 100644
--- a/lib/System/Atomic.cpp
+++ b/lib/System/Atomic.cpp
@@ -35,11 +35,11 @@
#endif
}
-uint32_t sys::CompareAndSwap32(volatile uint32_t* ptr,
- uint32_t new_value,
- uint32_t old_value) {
+sys::cas_flag sys::CompareAndSwap(volatile sys::cas_flag* ptr,
+ sys::cas_flag new_value,
+ sys::cas_flag old_value) {
#if LLVM_MULTITHREADED==0
- uint32_t result = *ptr;
+ sys::cas_flag result = *ptr;
if (result == old_value)
*ptr = new_value;
return result;
@@ -52,7 +52,7 @@
#endif
}
-int32_t sys::AtomicIncrement32(volatile int32_t* ptr) {
+sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
#if LLVM_MULTITHREADED==0
++(*ptr);
return *ptr;
@@ -65,7 +65,7 @@
#endif
}
-int32_t sys::AtomicDecrement32(volatile int32_t* ptr) {
+sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
#if LLVM_MULTITHREADED==0
--(*ptr);
return *ptr;
@@ -78,7 +78,7 @@
#endif
}
-int32_t sys::AtomicAdd32(volatile int32_t* ptr, int32_t val) {
+sys::cas_flag sys::AtomicAdd(volatile sys::cas_flag* ptr, sys::cas_flag val) {
#if LLVM_MULTITHREADED==0
*ptr += val;
return *ptr;
@@ -91,16 +91,4 @@
#endif
}
-int64_t sys::AtomicAdd64(volatile int64_t* ptr, int64_t val) {
-#if LLVM_MULTITHREADED==0
- *ptr += val;
- return *ptr;
-#elif defined(__GNUC__)
- return __sync_add_and_fetch(ptr, val);
-#elif defined(_MSC_VER)
- return InterlockedAdd64(ptr, val);
-#else
-# error No atomic add implementation for your platform!
-#endif
-}
diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index 6be06d2..1a68b89 100644
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -165,10 +165,10 @@
} else if (!GV->hasName()) {
// Must mangle the global into a unique ID.
unsigned TypeUniqueID = getTypeID(GV->getType());
- static int32_t GlobalID = 0;
+ static uint32_t GlobalID = 0;
- int32_t OldID = GlobalID;
- sys::AtomicIncrement32(&GlobalID);
+ unsigned OldID = GlobalID;
+ sys::AtomicIncrement(&GlobalID);
Name = "__unnamed_" + utostr(TypeUniqueID) + "_" + utostr(OldID);
} else {