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

[Brian Gaeke]

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

SecondTrigger.cpp updated: 1.15 -> 1.16

---
Log message:

Replace GET_COVERAGE with count_trace_cycles...I think the 
name is a little more evocative. And it's not a #define, so there.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.15 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.16
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.15	Mon Aug 18 15:34:20 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp	Mon Aug 18 23:01:36 2003
@@ -558,9 +558,8 @@
 
   int numberOfFunctions = 0; // only used in DEBUG output.
 
-#ifdef GET_COVERAGE
-  addCall(traces, callMap, index, (uint64_t)(intptr_t)&llvm_time_start);
-#endif
+  if (count_trace_cycles)
+    addCall(traces, callMap, index, (uint64_t)(intptr_t)&llvm_time_start);
 
   uint64_t pc = start;
 
@@ -662,15 +661,16 @@
       // slot following it.
       else if(isIndirectCall(instr)){
 	if(insertCode){
-#ifdef GET_COVERAGE
-	  addCall(traces, callMap, index, (uint64_t)(intptr_t)&llvm_time_end2);
-#endif
+	  if (count_trace_cycles)
+	    addCall(traces, callMap, index, (uint64_t)(intptr_t)&llvm_time_end2);
+
 	  traces.push_back(instr);
 	  traces.push_back(vm->readInstrFrmVm(pc+4, tr, tr2));
 	  index += 2;
-#ifdef GET_COVERAGE
-	  addCall(traces, callMap, index, (uint64_t)(intptr_t)&llvm_time_start);
-#endif
+
+	  if (count_trace_cycles)
+	    addCall(traces, callMap, index,
+		    (uint64_t)(intptr_t)&llvm_time_start);
 	}
 	pc += 8;
       }
@@ -712,19 +712,18 @@
 	    // following it. Record the call target function in the
 	    // call map.
 	    if(insertCode){
-#ifdef GET_COVERAGE
-	      addCall(traces, callMap, index,
-		      (uint64_t)(intptr_t)&llvm_time_end2);
-#endif
+	      if (count_trace_cycles)
+		addCall(traces, callMap, index,
+			(uint64_t)(intptr_t)&llvm_time_end2);
+
 	      traces.push_back(instr);
 	      callMap[index] = getCallTarget(instr, pc);
 	      traces.push_back(vm->readInstrFrmVm(pc+4, tr, tr2));
 	      index += 2;
 
-#ifdef GET_COVERAGE
-	      addCall(traces, callMap, index,
-		      (uint64_t)(intptr_t)&llvm_time_start);
-#endif
+	      if (count_trace_cycles)
+		addCall(traces, callMap, index,
+			(uint64_t)(intptr_t)&llvm_time_start);
 	    }
 	  }
 	  else{
@@ -830,13 +829,13 @@
 	index++;
       }
       
-#ifdef GET_COVERAGE
-      traces[index-1] = getBranchInst(br, (uint64_t)(&traces[4]), 
-                                      (uint64_t)(&traces[index-1]));
-#else
-      traces[index-1] = getBranchInst(br, (uint64_t)(&traces[0]), 
-                                      (uint64_t)(&traces[index-1]));
-#endif
+      if (count_trace_cycles) {
+	traces[index-1] = getBranchInst(br, (uint64_t)(&traces[4]), 
+					(uint64_t)(&traces[index-1]));
+      } else {
+	traces[index-1] = getBranchInst(br, (uint64_t)(&traces[0]), 
+					(uint64_t)(&traces[index-1]));
+      }
       traces.push_back(ds);
       index++;
     }
@@ -888,9 +887,8 @@
     unsigned int instr = instVec[MI->first];
     uint64_t pc = MI->second;
   
-#ifdef GET_COVERAGE
-    addCall(instVec, callMap, instIndex, (uint64_t)(intptr_t)&llvm_time_end2);
-#endif
+    if (count_trace_cycles)
+      addCall(instVec, callMap, instIndex, (uint64_t)(intptr_t)&llvm_time_end2);
 
     uint64_t target = targetMap[MI->first];
 
@@ -901,9 +899,9 @@
                                      (uint64_t)(&instVec[MI->first]));
     instVec[MI->first] = newInst;
 
-#ifdef GET_COVERAGE
-    instIndex += 4;
-#endif
+    if (count_trace_cycles)
+      instIndex += 4;
+
     branchMap[instIndex] = target;
     //change original call map to point to new PC
     //branchMap.erase(MI->first);