commit a7c12688da57ea052e127776ad3043ca5079488d
author buzbee <buzbee@google.com> Mon Mar 19 13:13:53 2012 -0700
committer buzbee <buzbee@google.com> Mon Mar 19 13:17:53 2012 -0700
tree a34c72a35f260e0680a486e3b98e7965dfcdc687
parent b3ab25b58945f1bd22da1be2eb49dc3eb121011e

Restore card marking, minor tuning

Restore GC card marks that were mistakenly dropped during an
earlier retructuring.  Add debugging to code to gather opcode
frequency statics.  Minor tuning for code size.

Change-Id: I117f62c29e29250277166e7f005706e27998f77a

src/compiler/Frontend.cc

diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index cca891d..3e0fd3a 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -51,6 +51,7 @@
      //(1 << kDebugVerifyDataflow) |
      //(1 << kDebugShowMemoryUsage) |
      //(1 << kDebugShowNops) |
+     //(1 << kDebugCountOpcodes) |
      0;
 
 inline bool contentIsInsn(const u2* codePtr) {
@@ -803,6 +804,12 @@
             (1 << kTrackLiveTemps));
     }
 
+    /* Gathering opcode stats? */
+    if (compilerDebugFlags & (1 << kDebugCountOpcodes)) {
+        cUnit->opcodeCount = (int*)oatNew(cUnit.get(),
+            kNumPackedOpcodes * sizeof(int), true, kAllocMisc);
+    }
+
     /* Assume non-throwing leaf */
     cUnit->attrs = (METHOD_IS_LEAF | METHOD_IS_THROW_FREE);
 
@@ -867,6 +874,9 @@
         insn->offset = curOffset;
         int width = parseInsn(cUnit.get(), codePtr, &insn->dalvikInsn, false);
         insn->width = width;
+        if (cUnit->opcodeCount != NULL) {
+            cUnit->opcodeCount[static_cast<int>(insn->dalvikInsn.opcode)]++;
+        }
 
         /* Terminate when the data section is seen */
         if (width == 0)
@@ -948,16 +958,21 @@
               ((cUnit->numBlocks > MANY_BLOCKS_INITIALIZER) &&
                PrettyMethod(method_idx, dex_file).find("init>") !=
                std::string::npos)) {
-            cUnit->disableDataflow = true;
-            // Disable optimization which require dataflow/ssa
-            cUnit->disableOpt |=
-                (1 << kNullCheckElimination) |
-                (1 << kBBOpt) |
-                (1 << kPromoteRegs);
-            if (cUnit->printMe) {
-                LOG(INFO) << "Compiler: " << PrettyMethod(method_idx, dex_file)
-                          << " too big: " << cUnit->numBlocks;
-            }
+            cUnit->qdMode = true;
+        }
+    }
+
+    if (cUnit->qdMode) {
+        cUnit->disableDataflow = true;
+        // Disable optimization which require dataflow/ssa
+        cUnit->disableOpt |=
+            (1 << kNullCheckElimination) |
+            (1 << kBBOpt) |
+            (1 << kPromoteRegs);
+        if (cUnit->printMe) {
+            LOG(INFO) << "QD mode enabled: "
+                      << PrettyMethod(method_idx, dex_file)
+                      << " too big: " << cUnit->numBlocks;
         }
     }
 
@@ -1011,6 +1026,17 @@
         if (cUnit->printMe) {
             oatCodegenDump(cUnit.get());
         }
+
+        if (cUnit->opcodeCount != NULL) {
+            LOG(INFO) << "Opcode Count";
+            for (int i = 0; i < kNumPackedOpcodes; i++) {
+                if (cUnit->opcodeCount[i] != 0) {
+                    LOG(INFO) << "-C- "
+                              <<Instruction::Name(static_cast<Instruction::Code>(i))
+                              << " " << cUnit->opcodeCount[i];
+                }
+            }
+        }
     }
 
     // Combine vmap tables - core regs, then fp regs - into vmapTable