diff options
| author | Ben Cheng <bccheng@android.com> | 2010-03-05 15:41:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-05 15:41:24 -0800 |
| commit | 157f1e38736c61640b6bb3c4570ece14c9215c4e (patch) | |
| tree | 1e23ceaac3e62fcda957b30e12d4b4870e3a3a6e /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | 1cb2cc2a9e2d13f67b613b6763f670744f465438 (diff) | |
| parent | f8069e844054d29f320a9ece29fc638a884bbf69 (diff) | |
am f8069e84: Merge "Collect more JIT stats in the assert build."
Merge commit 'f8069e844054d29f320a9ece29fc638a884bbf69' into dalvik-dev
* commit 'f8069e844054d29f320a9ece29fc638a884bbf69':
Collect more JIT stats in the assert build.
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index 1c2d0726c..8502f4882 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -840,7 +840,7 @@ static ArmLIR *genUnconditionalBranch(CompilationUnit *cUnit, ArmLIR *target) static void genReturnCommon(CompilationUnit *cUnit, MIR *mir) { genDispatchToHandler(cUnit, TEMPLATE_RETURN); -#if defined(INVOKE_STATS) +#if defined(JIT_STATS) gDvmJit.returnOp++; #endif int dPC = (int) (cUnit->method->insns + mir->offset); @@ -1010,13 +1010,13 @@ static void genInvokeSingletonCommon(CompilationUnit *cUnit, MIR *mir, */ if (dvmIsNativeMethod(calleeMethod)) { genDispatchToHandler(cUnit, TEMPLATE_INVOKE_METHOD_NATIVE); -#if defined(INVOKE_STATS) +#if defined(JIT_STATS) gDvmJit.invokeNative++; #endif } else { genDispatchToHandler(cUnit, TEMPLATE_INVOKE_METHOD_CHAIN); -#if defined(INVOKE_STATS) - gDvmJit.invokeChain++; +#if defined(JIT_STATS) + gDvmJit.invokeMonomorphic++; #endif /* Branch to the chaining cell */ genUnconditionalBranch(cUnit, &labelList[bb->taken->id]); @@ -1137,8 +1137,8 @@ static void genInvokeVirtualCommon(CompilationUnit *cUnit, MIR *mir, * r4PC = callsiteDPC, */ genDispatchToHandler(cUnit, TEMPLATE_INVOKE_METHOD_NO_OPT); -#if defined(INVOKE_STATS) - gDvmJit.invokePredictedChain++; +#if defined(JIT_STATS) + gDvmJit.invokePolymorphic++; #endif /* Handle exceptions using the interpreter */ genTrap(cUnit, mir->offset, pcrLabel); @@ -2829,8 +2829,8 @@ static bool handleFmt35c_3rc(CompilationUnit *cUnit, MIR *mir, BasicBlock *bb, * r4PC = callsiteDPC, */ genDispatchToHandler(cUnit, TEMPLATE_INVOKE_METHOD_NO_OPT); -#if defined(INVOKE_STATS) - gDvmJit.invokePredictedChain++; +#if defined(JIT_STATS) + gDvmJit.invokePolymorphic++; #endif /* Handle exceptions using the interpreter */ genTrap(cUnit, mir->offset, pcrLabel); @@ -3823,7 +3823,7 @@ gen_fallthrough: jitToInterpEntries.dvmJitToInterpNoChain), r2); opRegReg(cUnit, kOpAdd, r1, r1); opRegRegReg(cUnit, kOpAdd, r4PC, r0, r1); -#if defined(EXIT_STATS) +#if defined(JIT_STATS) loadConstant(cUnit, r0, kSwitchOverflow); #endif opReg(cUnit, kOpBlx, r2); |