Reland "Change hotness counting."

This reverts commit ce131feb7c60ffdf28c315c5d67f9cac33a077ce.

Bug: 203810169
Test: test.py
Test: health/microbench/startup/hscapps/compile-speed-profile/open-clock

Reason for revert: Kept logic from before on what methods to save in the
profile.

Change-Id: Id67cd47a9fe31b4c6b154db20f632015238016d2
diff --git a/tools/cpp-define-generator/globals.def b/tools/cpp-define-generator/globals.def
index ae8f5aa..2572ea6 100644
--- a/tools/cpp-define-generator/globals.def
+++ b/tools/cpp-define-generator/globals.def
@@ -64,6 +64,8 @@
            art::interpreter::kNterpHandlerSize)
 ASM_DEFINE(NTERP_HANDLER_SIZE_LOG2,
            art::WhichPowerOf2(art::interpreter::kNterpHandlerSize))
+ASM_DEFINE(NTERP_HOTNESS_VALUE,
+           art::interpreter::kNterpHotnessValue)
 ASM_DEFINE(OBJECT_ALIGNMENT_MASK,
            art::kObjectAlignment - 1)
 ASM_DEFINE(OBJECT_ALIGNMENT_MASK_TOGGLED,
@@ -80,7 +82,3 @@
            std::memory_order_relaxed)
 ASM_DEFINE(STACK_OVERFLOW_RESERVED_BYTES,
            GetStackOverflowReservedBytes(art::kRuntimeISA))
-ASM_DEFINE(NTERP_HOTNESS_MASK,
-           art::interpreter::kNterpHotnessMask)
-ASM_DEFINE(NTERP_HOTNESS_BITS,
-           art::POPCOUNT(art::interpreter::kNterpHotnessMask))