Fix x86 JIT log spam.

Removes all the E and I logging in cases like these:

    E( 2901) JIT couldn't compile Ljava/lang/Number;<init> dex_pc=0
    I( 2901) codeGenBasicBlockJit returns negative number
    E( 2901) JIT couldn't compile Ljava/lang/String;<init> dex_pc=0
    I( 2901) codeGenBasicBlockJit returns negative number
    E( 2901) JIT couldn't compile Ljava/util/Hashtable$HashtableEntry;<init> dex_pc=0
    I( 2901) codeGenBasicBlockJit returns negative number
    E( 2901) JIT couldn't compile Ljava/lang/AbstractStringBuilder;<init> dex_pc=0
    I( 2901) codeGenBasicBlockJit returns negative number
    E( 2901) JIT couldn't compile Ljava/util/HashMap$HashMapEntry;<init> dex_pc=0
    I( 2901) codeGenBasicBlockJit returns negative number

Change-Id: I020c01c11a3840e700bbeb39237da1a6d508be8a

2 files changed, 9 insertions, 2 deletions

diff --git a/vm/compiler/codegen/x86/AnalysisO1.cpp b/vm/compiler/codegen/x86/AnalysisO1.cpp
index d7e9726ec..2c816e3aa 100644
--- a/vm/compiler/codegen/x86/AnalysisO1.cpp
+++ b/vm/compiler/codegen/x86/AnalysisO1.cpp
@@ -864,7 +864,15 @@ int codeGenBasicBlock(const Method* method, BasicBlock_O1* bb) {
             }
 
             if (retCode == 1) {
-                ALOGE("JIT couldn't compile %s%s dex_pc=%d", method->clazz->descriptor, method->name, offsetPC);
+                // We always fall back to the interpreter for OP_INVOKE_OBJECT_INIT_RANGE,
+                // but any other failure is unexpected and should be logged.
+                if (mir->dalvikInsn.opcode != OP_INVOKE_OBJECT_INIT_RANGE) {
+                    ALOGE("JIT couldn't compile %s%s dex_pc=%d opcode=%d",
+                          method->clazz->descriptor,
+                          method->name,
+                          offsetPC,
+                          mir->dalvikInsn.opcode);
+                }
                 return -1;
             }
             updateConstInfo(bb);
diff --git a/vm/compiler/codegen/x86/CodegenInterface.cpp b/vm/compiler/codegen/x86/CodegenInterface.cpp
index c99fadd0a..c4ad445e5 100644
--- a/vm/compiler/codegen/x86/CodegenInterface.cpp
+++ b/vm/compiler/codegen/x86/CodegenInterface.cpp
@@ -1237,7 +1237,6 @@ void dvmCompilerMIR2LIR(CompilationUnit *cUnit, JitTranslationInfo *info)
             if(cg_ret < 0) {
                 endOfTrace(true/*freeOnly*/);
                 cUnit->baseAddr = NULL;
-                ALOGI("codeGenBasicBlockJit returns negative number");
                 PROTECT_CODE_CACHE(stream, unprotected_code_cache_bytes);
                 return;
             }