Clean up profile AddMethod APIs

Restructure the profile assistant test to use the same APIs as profile
saver and
clean up all the other usages for AddMethodIndex and AddMethod.

Bug: 139884006
Test: m test-art-host

Change-Id: Icf76d6aa05f0f9dcc589182196ca34a0298f2cb7

4 files changed, 313 insertions, 0 deletions

diff --git a/test/ProfileTestMultiDex/Main.java b/test/ProfileTestMultiDex/Main.java
index a8ced544c9..978cb2c6fd 100644
--- a/test/ProfileTestMultiDex/Main.java
+++ b/test/ProfileTestMultiDex/Main.java
@@ -67,3 +67,157 @@ class SubD extends Super {
 class SubE extends Super {
   int getValue() { return 16; };
 }
+
+// Add a class with lots of methods so we can test profile guided compilation triggers.
+class ZLotsOfMethods {
+  public void m1() {}
+  public void m2() {}
+  public void m3() {}
+  public void m4() {}
+  public void m5() {}
+  public void m6() {}
+  public void m7() {}
+  public void m8() {}
+  public void m9() {}
+  public void m10() {}
+  public void m11() {}
+  public void m12() {}
+  public void m13() {}
+  public void m14() {}
+  public void m15() {}
+  public void m16() {}
+  public void m17() {}
+  public void m18() {}
+  public void m19() {}
+  public void m20() {}
+  public void m21() {}
+  public void m22() {}
+  public void m23() {}
+  public void m24() {}
+  public void m25() {}
+  public void m26() {}
+  public void m27() {}
+  public void m28() {}
+  public void m29() {}
+  public void m30() {}
+  public void m31() {}
+  public void m32() {}
+  public void m33() {}
+  public void m34() {}
+  public void m35() {}
+  public void m36() {}
+  public void m37() {}
+  public void m38() {}
+  public void m39() {}
+  public void m40() {}
+  public void m41() {}
+  public void m42() {}
+  public void m43() {}
+  public void m44() {}
+  public void m45() {}
+  public void m46() {}
+  public void m47() {}
+  public void m48() {}
+  public void m49() {}
+  public void m50() {}
+  public void m51() {}
+  public void m52() {}
+  public void m53() {}
+  public void m54() {}
+  public void m55() {}
+  public void m56() {}
+  public void m57() {}
+  public void m58() {}
+  public void m59() {}
+  public void m60() {}
+  public void m61() {}
+  public void m62() {}
+  public void m63() {}
+  public void m64() {}
+  public void m65() {}
+  public void m66() {}
+  public void m67() {}
+  public void m68() {}
+  public void m69() {}
+  public void m70() {}
+  public void m71() {}
+  public void m72() {}
+  public void m73() {}
+  public void m74() {}
+  public void m75() {}
+  public void m76() {}
+  public void m77() {}
+  public void m78() {}
+  public void m79() {}
+  public void m80() {}
+  public void m81() {}
+  public void m82() {}
+  public void m83() {}
+  public void m84() {}
+  public void m85() {}
+  public void m86() {}
+  public void m87() {}
+  public void m88() {}
+  public void m89() {}
+  public void m90() {}
+  public void m91() {}
+  public void m92() {}
+  public void m93() {}
+  public void m94() {}
+  public void m95() {}
+  public void m96() {}
+  public void m97() {}
+  public void m98() {}
+  public void m99() {}
+  public void m100() {}
+  public void m101() {}
+  public void m102() {}
+  public void m103() {}
+  public void m104() {}
+  public void m105() {}
+  public void m106() {}
+  public void m107() {}
+  public void m108() {}
+  public void m109() {}
+  public void m110() {}
+  public void m111() {}
+  public void m112() {}
+  public void m113() {}
+  public void m114() {}
+  public void m115() {}
+  public void m116() {}
+  public void m117() {}
+  public void m118() {}
+  public void m119() {}
+  public void m120() {}
+  public void m121() {}
+  public void m122() {}
+  public void m123() {}
+  public void m124() {}
+  public void m125() {}
+  public void m126() {}
+  public void m127() {}
+  public void m128() {}
+  public void m129() {}
+  public void m130() {}
+  public void m131() {}
+  public void m132() {}
+  public void m133() {}
+  public void m134() {}
+  public void m135() {}
+  public void m136() {}
+  public void m137() {}
+  public void m138() {}
+  public void m139() {}
+  public void m140() {}
+  public void m141() {}
+  public void m142() {}
+  public void m143() {}
+  public void m144() {}
+  public void m145() {}
+  public void m146() {}
+  public void m147() {}
+  public void m148() {}
+  public void m149() {}
+  public void m150() {}
+}
diff --git a/test/ProfileTestMultiDex/Second.java b/test/ProfileTestMultiDex/Second.java
index 9f5dc66742..a2bb8d4bfd 100644
--- a/test/ProfileTestMultiDex/Second.java
+++ b/test/ProfileTestMultiDex/Second.java
@@ -38,3 +38,158 @@ class TestIntrinsicOatdump {
     return Integer.valueOf(i);
   }
 }
+
+// Add a class with lots of methods so we can test profile guided compilation triggers.
+// Start the name with 'Z' so that the class is added at the end of the dex file.
+class ZLotsOfMethodsSecond {
+  public void m1() {}
+  public void m2() {}
+  public void m3() {}
+  public void m4() {}
+  public void m5() {}
+  public void m6() {}
+  public void m7() {}
+  public void m8() {}
+  public void m9() {}
+  public void m10() {}
+  public void m11() {}
+  public void m12() {}
+  public void m13() {}
+  public void m14() {}
+  public void m15() {}
+  public void m16() {}
+  public void m17() {}
+  public void m18() {}
+  public void m19() {}
+  public void m20() {}
+  public void m21() {}
+  public void m22() {}
+  public void m23() {}
+  public void m24() {}
+  public void m25() {}
+  public void m26() {}
+  public void m27() {}
+  public void m28() {}
+  public void m29() {}
+  public void m30() {}
+  public void m31() {}
+  public void m32() {}
+  public void m33() {}
+  public void m34() {}
+  public void m35() {}
+  public void m36() {}
+  public void m37() {}
+  public void m38() {}
+  public void m39() {}
+  public void m40() {}
+  public void m41() {}
+  public void m42() {}
+  public void m43() {}
+  public void m44() {}
+  public void m45() {}
+  public void m46() {}
+  public void m47() {}
+  public void m48() {}
+  public void m49() {}
+  public void m50() {}
+  public void m51() {}
+  public void m52() {}
+  public void m53() {}
+  public void m54() {}
+  public void m55() {}
+  public void m56() {}
+  public void m57() {}
+  public void m58() {}
+  public void m59() {}
+  public void m60() {}
+  public void m61() {}
+  public void m62() {}
+  public void m63() {}
+  public void m64() {}
+  public void m65() {}
+  public void m66() {}
+  public void m67() {}
+  public void m68() {}
+  public void m69() {}
+  public void m70() {}
+  public void m71() {}
+  public void m72() {}
+  public void m73() {}
+  public void m74() {}
+  public void m75() {}
+  public void m76() {}
+  public void m77() {}
+  public void m78() {}
+  public void m79() {}
+  public void m80() {}
+  public void m81() {}
+  public void m82() {}
+  public void m83() {}
+  public void m84() {}
+  public void m85() {}
+  public void m86() {}
+  public void m87() {}
+  public void m88() {}
+  public void m89() {}
+  public void m90() {}
+  public void m91() {}
+  public void m92() {}
+  public void m93() {}
+  public void m94() {}
+  public void m95() {}
+  public void m96() {}
+  public void m97() {}
+  public void m98() {}
+  public void m99() {}
+  public void m100() {}
+  public void m101() {}
+  public void m102() {}
+  public void m103() {}
+  public void m104() {}
+  public void m105() {}
+  public void m106() {}
+  public void m107() {}
+  public void m108() {}
+  public void m109() {}
+  public void m110() {}
+  public void m111() {}
+  public void m112() {}
+  public void m113() {}
+  public void m114() {}
+  public void m115() {}
+  public void m116() {}
+  public void m117() {}
+  public void m118() {}
+  public void m119() {}
+  public void m120() {}
+  public void m121() {}
+  public void m122() {}
+  public void m123() {}
+  public void m124() {}
+  public void m125() {}
+  public void m126() {}
+  public void m127() {}
+  public void m128() {}
+  public void m129() {}
+  public void m130() {}
+  public void m131() {}
+  public void m132() {}
+  public void m133() {}
+  public void m134() {}
+  public void m135() {}
+  public void m136() {}
+  public void m137() {}
+  public void m138() {}
+  public void m139() {}
+  public void m140() {}
+  public void m141() {}
+  public void m142() {}
+  public void m143() {}
+  public void m144() {}
+  public void m145() {}
+  public void m146() {}
+  public void m147() {}
+  public void m148() {}
+  public void m149() {}
+  public void m150() {}
+}
diff --git a/test/ProfileTestMultiDex/main.jpp b/test/ProfileTestMultiDex/main.jpp
index 5e55e96874..0644072510 100644
--- a/test/ProfileTestMultiDex/main.jpp
+++ b/test/ProfileTestMultiDex/main.jpp
@@ -19,3 +19,6 @@ SubD:
 SubE:
   @@com.android.jack.annotations.ForceInMainDex
   class SubE
+ZLotsOfMethods:
+@@com.android.jack.annotations.ForceInMainDex
+  class ZLotsOfMethods
diff --git a/test/ProfileTestMultiDex/main.list b/test/ProfileTestMultiDex/main.list
index ec131f0f71..6ca79d4bbe 100644
--- a/test/ProfileTestMultiDex/main.list
+++ b/test/ProfileTestMultiDex/main.list
@@ -5,3 +5,4 @@ SubA.class
 SubB.class
 SubD.class
 SubE.class
+ZLotsOfMethods.class