Menu
▾
▴
[rvm-commits] SF.net SVN: jikesrvm:[15270] rvmroot/branches/RVM-PureNativeThread/ workingMergeUp/rvm/src/org/jikesrvm/adaptive
|
From: <cap...@us...> - 2009-01-09 18:10:13
|
Revision: 15270
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15270&view=rev
Author: captain5050
Date: 2009-01-09 18:10:08 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
Start of merge with trunk at r15258
Modified Paths:
--------------
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java 2009-01-09 18:06:22 UTC (rev 15269)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java 2009-01-09 18:10:08 UTC (rev 15270)
@@ -91,7 +91,7 @@
Controller.compilationQueue.insert(priority, plan);
- AOSLogging.logOsrEvent("OSR inserts compilation plan successfully!");
+ AOSLogging.logger.logOsrEvent("OSR inserts compilation plan successfully!");
// do not hold the reference anymore.
suspendedThread = null;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java 2009-01-09 18:06:22 UTC (rev 15269)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java 2009-01-09 18:10:08 UTC (rev 15270)
@@ -306,7 +306,7 @@
double ns = counts[index];
HotMethodRecompilationEvent event = new HotMethodRecompilationEvent(cm, ns);
Controller.controllerInputQueue.insert(ns, event);
- AOSLogging.controllerNotifiedForHotness(cm, ns);
+ AOSLogging.logger.controllerNotifiedForHotness(cm, ns);
}
// Since I was hot enough, also consider my children.
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java 2009-01-09 18:06:22 UTC (rev 15269)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java 2009-01-09 18:10:08 UTC (rev 15270)
@@ -15,7 +15,6 @@
import org.jikesrvm.adaptive.OnStackReplacementPlan;
import org.jikesrvm.adaptive.controller.Controller;
import org.jikesrvm.adaptive.controller.ControllerPlan;
-import org.jikesrvm.adaptive.util.AOSLogging;
import org.jikesrvm.scheduler.RVMThread;
import org.vmmagic.pragma.NonMoving;
@@ -45,8 +44,6 @@
* them.
*/
public void run() {
- AOSLogging.compilationThreadStarted();
-
// Make a blocking call to deleteMin to get a plan and then execute it.
// Repeat...
while (true) {
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java 2009-01-09 18:06:22 UTC (rev 15269)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java 2009-01-09 18:10:08 UTC (rev 15270)
@@ -170,10 +170,10 @@
}
for (int i = 0; i < compilationRates.length; i++) {
- AOSLogging.reportCompilationRate(i, compilationRates[i]);
+ AOSLogging.logger.reportCompilationRate(i, compilationRates[i]);
}
for (int i = 0; i < speedupRates.length; i++) {
- AOSLogging.reportSpeedupRate(i, speedupRates[i]);
+ AOSLogging.logger.reportSpeedupRate(i, speedupRates[i]);
}
// Compute MAX_OPT_LEVEL
@@ -206,9 +206,9 @@
// Since compilation rates are not relative to the 1st compiler
// we invert the division.
compileTimeRatio[prevCompiler][nextCompiler] = compilationRates[prevCompiler] / compilationRates[nextCompiler];
- AOSLogging.reportBenefitRatio(prevCompiler, nextCompiler, benefitRatio[prevCompiler][nextCompiler]);
+ AOSLogging.logger.reportBenefitRatio(prevCompiler, nextCompiler, benefitRatio[prevCompiler][nextCompiler]);
- AOSLogging.reportCompileTimeRatio(prevCompiler, nextCompiler, compileTimeRatio[prevCompiler][nextCompiler]);
+ AOSLogging.logger.reportCompileTimeRatio(prevCompiler, nextCompiler, compileTimeRatio[prevCompiler][nextCompiler]);
}
}
}
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java 2009-01-09 18:06:22 UTC (rev 15269)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java 2009-01-09 18:10:08 UTC (rev 15270)
@@ -97,18 +97,18 @@
if (Controller.options.counters()) {
// for invocation counter, we only use one optimization level
compPlan = InvocationCounts.createCompilationPlan((NormalMethod) method);
- AOSLogging.recompilationStarted(compPlan);
+ AOSLogging.logger.recompilationStarted(compPlan);
RuntimeCompiler.recompileWithOpt(compPlan);
- AOSLogging.recompilationCompleted(compPlan);
+ AOSLogging.logger.recompilationCompleted(compPlan);
} else if (Controller.options.sampling()) {
// Create our set of standard optimization plans.
compPlan =
Controller.recompilationStrategy.createCompilationPlan((NormalMethod) method,
value.getOptLevel(),
null);
- AOSLogging.recompilationStarted(compPlan);
+ AOSLogging.logger.recompilationStarted(compPlan);
RuntimeCompiler.recompileWithOpt(compPlan);
- AOSLogging.recompilationCompleted(compPlan);
+ AOSLogging.logger.recompilationCompleted(compPlan);
} else {
VM.sysWriteln("Compiler advice file is not followed ");
method.compile();
@@ -117,6 +117,6 @@
}
}
}
- AOSLogging.compileAllMethodsCompleted();
+ AOSLogging.logger.compileAllMethodsCompleted();
}
}
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java 2009-01-09 18:06:22 UTC (rev 15269)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java 2009-01-09 18:10:08 UTC (rev 15270)
@@ -111,7 +111,7 @@
}
public boolean shouldPerform(OptOptions options) {
- return options.INSTRUMENTATION_SAMPLING;
+ return options.ADAPTIVE_INSTRUMENTATION_SAMPLING;
}
public String getName() { return "InstrumentationSamplingFramework"; }
@@ -133,7 +133,7 @@
}
// Perform the actual phase here.
- if (ir.options.NO_DUPLICATION) {
+ if (ir.options.ADAPTIVE_NO_DUPLICATION) {
performVariationNoDuplication(ir);
} else {
performVariationFullDuplication(ir, this);
@@ -164,7 +164,7 @@
private void cleanUp(IR ir) {
// Clean up the ir with simple optimizations
- Simple simple = new Simple(-1, false, false, false);
+ Simple simple = new Simple(-1, false, false, false, false);
simple.perform(ir);
// Perform branch optimizations (level 0 is passed because if we
@@ -439,7 +439,7 @@
if (DEBUG) VM.sysWrite("Adding load to " + bb + "\n");
Instruction load = null;
- if (ir.options.PROCESSOR_SPECIFIC_COUNTER) {
+ if (ir.options.ADAPTIVE_PROCESSOR_SPECIFIC_COUNTER) {
// Use one CBS counter per processor (better for multi threaded apps)
if (ir.IRStage == IR.HIR) {
@@ -495,7 +495,7 @@
if (DEBUG) VM.sysWrite("Adding store to " + bb + "\n");
Instruction store = null;
- if (ir.options.PROCESSOR_SPECIFIC_COUNTER) {
+ if (ir.options.ADAPTIVE_PROCESSOR_SPECIFIC_COUNTER) {
store =
Store.create(INT_STORE,
cbsReg.copyRO(),
@@ -589,7 +589,7 @@
dummy.insertBefore(load);
// Store it in the counter register
- if (ir.options.PROCESSOR_SPECIFIC_COUNTER) {
+ if (ir.options.ADAPTIVE_PROCESSOR_SPECIFIC_COUNTER) {
store =
Store.create(INT_STORE,
cbsReg.copyRO(),
@@ -731,7 +731,7 @@
// been transfered to the duplicated code.
for (InstructionEnumeration ie = origBlock.forwardInstrEnumerator(); ie.hasMoreElements();) {
Instruction i = ie.next();
- if (isInstrumentationInstruction(i) || (isYieldpoint(i) && ir.options.REMOVE_YP_FROM_CHECKING)) {
+ if (isInstrumentationInstruction(i) || (isYieldpoint(i) && ir.options.ADAPTIVE_REMOVE_YP_FROM_CHECKING)) {
if (DEBUG) VM.sysWrite("Removing " + i + "\n");
i.remove();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|