OSDN Git Service

android-x86/art.git
8 years agoMerge "Step-wise improvement of range analysis with outer loop induction." am: d38299...
Aart Bik [Fri, 4 Dec 2015 16:55:31 +0000 (16:55 +0000)]
Merge "Step-wise improvement of range analysis with outer loop induction." am: d382994228 am: d77596bb5d
am: eb25b090d6

* commit 'eb25b090d6edfe94d96120336eed217b2058970c':
  Step-wise improvement of range analysis with outer loop induction.

8 years agoMerge "Step-wise improvement of range analysis with outer loop induction." am: d382994228
Aart Bik [Fri, 4 Dec 2015 16:51:01 +0000 (08:51 -0800)]
Merge "Step-wise improvement of range analysis with outer loop induction." am: d382994228
am: d77596bb5d

* commit 'd77596bb5d9da26bda27ab3db71e2f9f118d3b4e':
  Step-wise improvement of range analysis with outer loop induction.

8 years agoMerge "Step-wise improvement of range analysis with outer loop induction."
Aart Bik [Fri, 4 Dec 2015 16:48:08 +0000 (08:48 -0800)]
Merge "Step-wise improvement of range analysis with outer loop induction."
am: d382994228

* commit 'd382994228e0f3eaba26af14393546bf7027cc2b':
  Step-wise improvement of range analysis with outer loop induction.

8 years agoMerge "Step-wise improvement of range analysis with outer loop induction."
Aart Bik [Fri, 4 Dec 2015 16:40:50 +0000 (16:40 +0000)]
Merge "Step-wise improvement of range analysis with outer loop induction."

8 years agoMerge "MIPS32: java.lang.*.reverse" am: eddbfb74ae am: 9754484c2b
Andreas Gampe [Fri, 4 Dec 2015 16:38:19 +0000 (16:38 +0000)]
Merge "MIPS32: java.lang.*.reverse" am: eddbfb74ae am: 9754484c2b
am: e54062b2d2

* commit 'e54062b2d2a4e2038f55822bc443248e1170cb3b':
  MIPS32: java.lang.*.reverse

8 years agoMerge "MIPS32: java.lang.*.reverse" am: eddbfb74ae
Andreas Gampe [Fri, 4 Dec 2015 16:33:48 +0000 (16:33 +0000)]
Merge "MIPS32: java.lang.*.reverse" am: eddbfb74ae
am: 9754484c2b

* commit '9754484c2b25dffc6fd6c2727e9568253b6e0635':
  MIPS32: java.lang.*.reverse

8 years agoMerge "MIPS32: java.lang.*.reverse"
Andreas Gampe [Fri, 4 Dec 2015 16:31:00 +0000 (16:31 +0000)]
Merge "MIPS32: java.lang.*.reverse"
am: eddbfb74ae

* commit 'eddbfb74ae5de6b42be9f47da386cd9507eb3e53':
  MIPS32: java.lang.*.reverse

8 years agoMerge "MIPS32: java.lang.*.reverse"
Andreas Gampe [Fri, 4 Dec 2015 16:28:11 +0000 (16:28 +0000)]
Merge "MIPS32: java.lang.*.reverse"

8 years agoMerge "Inline monomorphic calls." am: 099f2713ce am: f1493c5006
Nicolas Geoffray [Fri, 4 Dec 2015 12:24:44 +0000 (12:24 +0000)]
Merge "Inline monomorphic calls." am: 099f2713ce am: f1493c5006
am: e51ada2343

* commit 'e51ada234324911d246ffcba9bb316cd861f58b2':
  Inline monomorphic calls.

8 years agoMerge "No need merging bulk free list again when revoking thread local runs" am:...
Hiroshi Yamauchi [Fri, 4 Dec 2015 12:24:36 +0000 (12:24 +0000)]
Merge "No need merging bulk free list again when revoking thread local runs" am: 352c36e96e am: cf406066a5
am: 39219a793f

* commit '39219a793ff406ff241b77cc6fef909f1ea3bf11':
  No need merging bulk free list again when revoking thread local runs

8 years agoMerge "ART: Add test for DetachCurrentThread monitor behavior" am: 06c86948b0 am...
Andreas Gampe [Fri, 4 Dec 2015 12:24:27 +0000 (12:24 +0000)]
Merge "ART: Add test for DetachCurrentThread monitor behavior" am: 06c86948b0 am: 2676897d23
am: 6e066cf00d

* commit '6e066cf00d397c646a131b4e03ab3d96d0f89ca2':
  ART: Add test for DetachCurrentThread monitor behavior

8 years agoMerge "Inline monomorphic calls." am: 099f2713ce
Nicolas Geoffray [Fri, 4 Dec 2015 12:21:23 +0000 (12:21 +0000)]
Merge "Inline monomorphic calls." am: 099f2713ce
am: f1493c5006

* commit 'f1493c5006b0e3fbbe14dc19dc6dffebe158f2c0':
  Inline monomorphic calls.

8 years agoMerge "Inline monomorphic calls."
Nicolas Geoffray [Fri, 4 Dec 2015 12:18:29 +0000 (12:18 +0000)]
Merge "Inline monomorphic calls."
am: 099f2713ce

* commit '099f2713ce4ed284c94239cc22d3a8c8d9cfe868':
  Inline monomorphic calls.

8 years agoMerge "Inline monomorphic calls."
Nicolas Geoffray [Fri, 4 Dec 2015 12:14:38 +0000 (12:14 +0000)]
Merge "Inline monomorphic calls."

8 years agoInline monomorphic calls.
Nicolas Geoffray [Thu, 17 Sep 2015 14:22:56 +0000 (15:22 +0100)]
Inline monomorphic calls.

Change-Id: If38171c2dc7d4a4378df5d050afc4fff4499c98f

8 years agoStep-wise improvement of range analysis with outer loop induction.
Aart Bik [Thu, 3 Dec 2015 19:23:35 +0000 (11:23 -0800)]
Step-wise improvement of range analysis with outer loop induction.

Rationale: Using a step-wise approach (rather than expanding all ranges
           at once) increases the opportunities for statically removing
           bound checks, as demonstrated by the new checker tests.

Change-Id: Icbfd9406523a069e1fb7508546ea94f896e5a255

8 years agoMerge "No need merging bulk free list again when revoking thread local runs" am:...
Hiroshi Yamauchi [Thu, 3 Dec 2015 23:53:16 +0000 (23:53 +0000)]
Merge "No need merging bulk free list again when revoking thread local runs" am: 352c36e96e
am: cf406066a5

* commit 'cf406066a560b137dad6d2e1b52c0294c9a1f516':
  No need merging bulk free list again when revoking thread local runs

8 years agoMerge "No need merging bulk free list again when revoking thread local runs"
Hiroshi Yamauchi [Thu, 3 Dec 2015 23:48:53 +0000 (23:48 +0000)]
Merge "No need merging bulk free list again when revoking thread local runs"
am: 352c36e96e

* commit '352c36e96e05d630aa3d570e66a4d9b645a96c37':
  No need merging bulk free list again when revoking thread local runs

8 years agoMerge "No need merging bulk free list again when revoking thread local runs"
Hiroshi Yamauchi [Thu, 3 Dec 2015 23:43:27 +0000 (23:43 +0000)]
Merge "No need merging bulk free list again when revoking thread local runs"

8 years agoMerge "ART: Add test for DetachCurrentThread monitor behavior" am: 06c86948b0
Andreas Gampe [Thu, 3 Dec 2015 23:22:44 +0000 (23:22 +0000)]
Merge "ART: Add test for DetachCurrentThread monitor behavior" am: 06c86948b0
am: 2676897d23

* commit '2676897d235225bb3be94aaeb76b0181d28628a5':
  ART: Add test for DetachCurrentThread monitor behavior

8 years agoMerge "ART: Add test for DetachCurrentThread monitor behavior"
Andreas Gampe [Thu, 3 Dec 2015 23:19:07 +0000 (23:19 +0000)]
Merge "ART: Add test for DetachCurrentThread monitor behavior"
am: 06c86948b0

* commit '06c86948b013f575ca5db971d0f0bb42897dfeca':
  ART: Add test for DetachCurrentThread monitor behavior

8 years agoMerge "ART: Add test for DetachCurrentThread monitor behavior"
Andreas Gampe [Thu, 3 Dec 2015 23:12:26 +0000 (23:12 +0000)]
Merge "ART: Add test for DetachCurrentThread monitor behavior"

8 years agoMerge "imgdiag: Fix rarely flaky imgdiag_test." am: ef45113d01 am: e5840157f0
Igor Murashkin [Thu, 3 Dec 2015 19:42:43 +0000 (19:42 +0000)]
Merge "imgdiag: Fix rarely flaky imgdiag_test." am: ef45113d01 am: e5840157f0
am: b277f14d7e

* commit 'b277f14d7e5321d082e9b821795e81f009343494':
  imgdiag: Fix rarely flaky imgdiag_test.

8 years agoMerge "Revert "Enable profiled guided compilation in dex2oat"" am: 68cebffee2 am...
Nicolas Geoffray [Thu, 3 Dec 2015 19:42:35 +0000 (19:42 +0000)]
Merge "Revert "Enable profiled guided compilation in dex2oat"" am: 68cebffee2 am: e6527ffc11
am: ef769dc0ea

* commit 'ef769dc0eaacda0e2be4ad485610e86879c4fe76':
  Revert "Enable profiled guided compilation in dex2oat"

8 years agoMerge "Revert "Fix test path in libarttest.mk"" am: 57989d6f72 am: d378028bea
Nicolas Geoffray [Thu, 3 Dec 2015 19:42:27 +0000 (19:42 +0000)]
Merge "Revert "Fix test path in libarttest.mk"" am: 57989d6f72 am: d378028bea
am: 07474561b4

* commit '07474561b4092ff5ec201587df9e51d01d5de568':
  Revert "Fix test path in libarttest.mk"

8 years agoMerge "Revert "Fix the order in which profiled methods are dumped."" am: 801c73c819...
Nicolas Geoffray [Thu, 3 Dec 2015 19:42:19 +0000 (19:42 +0000)]
Merge "Revert "Fix the order in which profiled methods are dumped."" am: 801c73c819 am: 9fb1588ff6
am: 971c8f1912

* commit '971c8f1912b903c64083378d382f46f81145a5f8':
  Revert "Fix the order in which profiled methods are dumped."

8 years agoMerge "Revert "Disable 554-jit-profile-file for unsupported test modes"" am: 15b103f7...
Nicolas Geoffray [Thu, 3 Dec 2015 19:42:11 +0000 (19:42 +0000)]
Merge "Revert "Disable 554-jit-profile-file for unsupported test modes"" am: 15b103f728 am: 67041ca144
am: 5b1d5394ca

* commit '5b1d5394cae08e9dfb39f54dc1bc485b6f3cb82b':
  Revert "Disable 554-jit-profile-file for unsupported test modes"

8 years agoMerge "imgdiag: Fix rarely flaky imgdiag_test." am: ef45113d01
Igor Murashkin [Thu, 3 Dec 2015 19:37:55 +0000 (19:37 +0000)]
Merge "imgdiag: Fix rarely flaky imgdiag_test." am: ef45113d01
am: e5840157f0

* commit 'e5840157f09fb7a64af524d82335b5322390d68c':
  imgdiag: Fix rarely flaky imgdiag_test.

8 years agoMerge "imgdiag: Fix rarely flaky imgdiag_test."
Igor Murashkin [Thu, 3 Dec 2015 19:33:03 +0000 (19:33 +0000)]
Merge "imgdiag: Fix rarely flaky imgdiag_test."
am: ef45113d01

* commit 'ef45113d01c16102538a8848d6979e772dad6225':
  imgdiag: Fix rarely flaky imgdiag_test.

8 years agoMerge "imgdiag: Fix rarely flaky imgdiag_test."
Igor Murashkin [Thu, 3 Dec 2015 19:24:51 +0000 (19:24 +0000)]
Merge "imgdiag: Fix rarely flaky imgdiag_test."

8 years agoimgdiag: Fix rarely flaky imgdiag_test.
Igor Murashkin [Thu, 3 Dec 2015 18:47:08 +0000 (10:47 -0800)]
imgdiag: Fix rarely flaky imgdiag_test.

Don't hardcode pid as we could get unlucky and a real process
could have a pid of 12345.

This prevents false negatives by making the PID always be out-of-range
for valid kernel PIDs.

Change-Id: I8e8ae5c20a39e95b27b35905d5273c77dbf701f9

8 years agoART: Add test for DetachCurrentThread monitor behavior
Andreas Gampe [Thu, 3 Dec 2015 18:56:18 +0000 (10:56 -0800)]
ART: Add test for DetachCurrentThread monitor behavior

DetachCurrentThread is supposed to release any locks acquired through
JNI. The functionality has been there, add a test.

Bug: 20453586
Change-Id: I537f38e3e4003fe0846d037dbb235f2ea6ff8716

8 years agoMerge "Revert "Enable profiled guided compilation in dex2oat"" am: 68cebffee2
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:35 +0000 (23:09 +0000)]
Merge "Revert "Enable profiled guided compilation in dex2oat"" am: 68cebffee2
am: e6527ffc11

* commit 'e6527ffc11b2cb6b47709ea445adf80fd85be052':
  Revert "Enable profiled guided compilation in dex2oat"

8 years agoMerge "Revert "Fix test path in libarttest.mk"" am: 57989d6f72
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:29 +0000 (23:09 +0000)]
Merge "Revert "Fix test path in libarttest.mk"" am: 57989d6f72
am: d378028bea

* commit 'd378028bea92d43fb827308837f00737f0b3b701':
  Revert "Fix test path in libarttest.mk"

8 years agoMerge "Revert "Fix the order in which profiled methods are dumped."" am: 801c73c819
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:21 +0000 (23:09 +0000)]
Merge "Revert "Fix the order in which profiled methods are dumped."" am: 801c73c819
am: 9fb1588ff6

* commit '9fb1588ff6c89d5e5da02acd4a64d4ce0827481b':
  Revert "Fix the order in which profiled methods are dumped."

8 years agoMerge "Revert "Disable 554-jit-profile-file for unsupported test modes"" am: 15b103f728
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Revert "Disable 554-jit-profile-file for unsupported test modes"" am: 15b103f728
am: 67041ca144

* commit '67041ca144bd417e4812e46603acb4f794f75851':
  Revert "Disable 554-jit-profile-file for unsupported test modes"

8 years agoMerge "Revert "Enable profiled guided compilation in dex2oat""
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:38 +0000 (23:04 +0000)]
Merge "Revert "Enable profiled guided compilation in dex2oat""
am: 68cebffee2

* commit '68cebffee2f44f0345bd7be7e4cbad0f10e64082':
  Revert "Enable profiled guided compilation in dex2oat"

8 years agoMerge "Revert "Fix test path in libarttest.mk""
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:31 +0000 (23:04 +0000)]
Merge "Revert "Fix test path in libarttest.mk""
am: 57989d6f72

* commit '57989d6f7292155f4d91ce423cede17d04dd9343':
  Revert "Fix test path in libarttest.mk"

8 years agoMerge "Revert "Fix the order in which profiled methods are dumped.""
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:25 +0000 (23:04 +0000)]
Merge "Revert "Fix the order in which profiled methods are dumped.""
am: 801c73c819

* commit '801c73c819a4f03beb4af170fc80d9907ff4f2a4':
  Revert "Fix the order in which profiled methods are dumped."

8 years agoMerge "Revert "Disable 554-jit-profile-file for unsupported test modes""
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:18 +0000 (23:04 +0000)]
Merge "Revert "Disable 554-jit-profile-file for unsupported test modes""
am: 15b103f728

* commit '15b103f728396473cb3b398a9bbe4452fa916299':
  Revert "Disable 554-jit-profile-file for unsupported test modes"

8 years agoMerge "Revert "Enable profiled guided compilation in dex2oat""
Nicolas Geoffray [Wed, 2 Dec 2015 23:01:21 +0000 (23:01 +0000)]
Merge "Revert "Enable profiled guided compilation in dex2oat""

8 years agoRevert "Enable profiled guided compilation in dex2oat"
Nicolas Geoffray [Wed, 2 Dec 2015 22:44:52 +0000 (22:44 +0000)]
Revert "Enable profiled guided compilation in dex2oat"

Test has flakes:

+art F 30865 30865 art/runtime/java_vm_ext.cc:466] JNI DETECTED ERROR IN APPLICATION: input is not valid Modified UTF-8: illegal start byte 0x80
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     string: '��gy�\7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     input: '<0x80> 0xd8 0x67 0x79 0x8e 0x7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     in call to NewStringUTF
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     from java.lang.String Main.getProfileInfoDump(java.lang.String, java.lang.Class, java.lang.Class)

This reverts commit 27e17fd81cc30e16e86c9c15498cae7f920c9dfe.

Change-Id: Id224b5970c3620c4c71fc0d39ed4a2e4755e5f29

8 years agoMerge "Revert "Fix test path in libarttest.mk""
Nicolas Geoffray [Wed, 2 Dec 2015 23:00:37 +0000 (23:00 +0000)]
Merge "Revert "Fix test path in libarttest.mk""

8 years agoRevert "Fix test path in libarttest.mk"
Nicolas Geoffray [Wed, 2 Dec 2015 23:00:20 +0000 (23:00 +0000)]
Revert "Fix test path in libarttest.mk"

Test has flakes:

+art F 30865 30865 art/runtime/java_vm_ext.cc:466] JNI DETECTED ERROR IN APPLICATION: input is not valid Modified UTF-8: illegal start byte 0x80
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     string: '��gy�\7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     input: '<0x80> 0xd8 0x67 0x79 0x8e 0x7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     in call to NewStringUTF
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     from java.lang.String Main.getProfileInfoDump(java.lang.String, java.lang.Class, java.lang.Class)

This reverts commit 95f51a71d28be844e68fe3dda3ed0bba6b99f8ad.

Change-Id: I32ae3ad8e2e6c4eed1d3f79e5498709c43afadcb

8 years agoMerge "Revert "Fix the order in which profiled methods are dumped.""
Nicolas Geoffray [Wed, 2 Dec 2015 22:58:53 +0000 (22:58 +0000)]
Merge "Revert "Fix the order in which profiled methods are dumped.""

8 years agoMerge "Revert "Disable 554-jit-profile-file for unsupported test modes""
Nicolas Geoffray [Wed, 2 Dec 2015 22:58:39 +0000 (22:58 +0000)]
Merge "Revert "Disable 554-jit-profile-file for unsupported test modes""

8 years agoRevert "Disable 554-jit-profile-file for unsupported test modes"
Nicolas Geoffray [Wed, 2 Dec 2015 22:46:12 +0000 (22:46 +0000)]
Revert "Disable 554-jit-profile-file for unsupported test modes"

Test has flakes:

+art F 30865 30865 art/runtime/java_vm_ext.cc:466] JNI DETECTED ERROR IN APPLICATION: input is not valid Modified UTF-8: illegal start byte 0x80
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     string: '��gy�\7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     input: '<0x80> 0xd8 0x67 0x79 0x8e 0x7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     in call to NewStringUTF
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     from java.lang.String Main.getProfileInfoDump(java.lang.String, java.lang.Class, java.lang.Class)

This reverts commit 33bcb0734db9ccfdd0e8bb8fba77c1e0a1904090.

Change-Id: I3fe236acb196e847b7845802e436b0ee893144e6

8 years agoRevert "Fix the order in which profiled methods are dumped."
Nicolas Geoffray [Wed, 2 Dec 2015 22:45:39 +0000 (22:45 +0000)]
Revert "Fix the order in which profiled methods are dumped."

Test has flakes:
+art F 30865 30865 art/runtime/java_vm_ext.cc:466] JNI DETECTED ERROR IN APPLICATION: input is not valid Modified UTF-8: illegal start byte 0x80
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     string: '��gy�\7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     input: '<0x80> 0xd8 0x67 0x79 0x8e 0x7f'
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     in call to NewStringUTF
+art F 30865 30865 art/runtime/java_vm_ext.cc:466]     from java.lang.String Main.getProfileInfoDump(java.lang.String, java.lang.Class, java.lang.Class)

This reverts commit 1d2760bb6128f1bd623824ebcef5784d81b2ab85.

Change-Id: I84e478d715c1496892fa800778fc454d15e5d2c5

8 years agoMerge "ART: Fix Mac build" am: 5337bbfbd1 am: 893b4c8193
Andreas Gampe [Wed, 2 Dec 2015 22:45:24 +0000 (22:45 +0000)]
Merge "ART: Fix Mac build" am: 5337bbfbd1 am: 893b4c8193
am: 994b1579c3

* commit '994b1579c324ebe9fdf589b531d00ec37e495219':
  ART: Fix Mac build

8 years agoMerge "ART: Fix Makefile" am: a2ac43cdb0 am: c62f6970cb
Andreas Gampe [Wed, 2 Dec 2015 22:45:15 +0000 (22:45 +0000)]
Merge "ART: Fix Makefile" am: a2ac43cdb0 am: c62f6970cb
am: 84bbe8b5a1

* commit '84bbe8b5a10fee84739dd020b62ac8b975ace5c0':
  ART: Fix Makefile

8 years agoART: Fix Makefile
Andreas Gampe [Wed, 2 Dec 2015 19:49:01 +0000 (11:49 -0800)]
ART: Fix Makefile

Fix the run-test makefile.

(cherry picked from commit 4adc26e8c68be3304f9c1714758e72f98526d68b)

Change-Id: Iccd64165e70a3e18cd966289f150f053b091ef7c

8 years agoART: Fix Mac build
Andreas Gampe [Wed, 2 Dec 2015 19:53:26 +0000 (11:53 -0800)]
ART: Fix Mac build

dl_iterate_context code should only be done when we're not on the
Mac. #ifdef out DlOpenOatFile::PreSetup code.

(cherry picked from commit fd5c59939dff010432eb97b3e1ab0ad96abf79a6)

Change-Id: I11e8f95e397a327f2aa0b749ecbf6f03bdb76f24

8 years agoMerge "ART: Fix Mac build" am: 5337bbfbd1
Andreas Gampe [Wed, 2 Dec 2015 20:01:13 +0000 (20:01 +0000)]
Merge "ART: Fix Mac build" am: 5337bbfbd1
am: 893b4c8193

* commit '893b4c819321253f36bdca778aeb5d3ada871ae7':
  ART: Fix Mac build

8 years agoMerge "ART: Fix Makefile" am: a2ac43cdb0
Andreas Gampe [Wed, 2 Dec 2015 20:01:06 +0000 (20:01 +0000)]
Merge "ART: Fix Makefile" am: a2ac43cdb0
am: c62f6970cb

* commit 'c62f6970cbd646946f0b38932e16d30ef711a77f':
  ART: Fix Makefile

8 years agoMerge "ART: Fix Mac build"
Andreas Gampe [Wed, 2 Dec 2015 19:57:26 +0000 (19:57 +0000)]
Merge "ART: Fix Mac build"
am: 5337bbfbd1

* commit '5337bbfbd1cd502bb2842698a6b2a543ab6a6c32':
  ART: Fix Mac build

8 years agoMerge "ART: Fix Makefile"
Andreas Gampe [Wed, 2 Dec 2015 19:57:19 +0000 (19:57 +0000)]
Merge "ART: Fix Makefile"
am: a2ac43cdb0

* commit 'a2ac43cdb031980ceceee3b91d350d5530398018':
  ART: Fix Makefile

8 years agoMerge "ART: Fix Mac build"
Andreas Gampe [Wed, 2 Dec 2015 19:55:20 +0000 (19:55 +0000)]
Merge "ART: Fix Mac build"

8 years agoART: Fix Mac build
Andreas Gampe [Wed, 2 Dec 2015 19:53:26 +0000 (11:53 -0800)]
ART: Fix Mac build

dl_iterate_context code should only be done when we're not on the
Mac. #ifdef out DlOpenOatFile::PreSetup code.

Change-Id: I11e8f95e397a327f2aa0b749ecbf6f03bdb76f24

8 years agoMerge "ART: Fix Makefile"
Andreas Gampe [Wed, 2 Dec 2015 19:51:29 +0000 (19:51 +0000)]
Merge "ART: Fix Makefile"

8 years agoART: Fix Makefile
Andreas Gampe [Wed, 2 Dec 2015 19:49:01 +0000 (11:49 -0800)]
ART: Fix Makefile

Fix the run-test makefile.

Change-Id: Iccd64165e70a3e18cd966289f150f053b091ef7c

8 years agoMerge "Disable 554-jit-profile-file for unsupported test modes" am: 07e9dc8677 am...
Calin Juravle [Wed, 2 Dec 2015 19:32:14 +0000 (19:32 +0000)]
Merge "Disable 554-jit-profile-file for unsupported test modes" am: 07e9dc8677 am: 20b1d97b00
am: cbf2d86690

* commit 'cbf2d86690213e207653d327dae4880caf11fceb':
  Disable 554-jit-profile-file for unsupported test modes

8 years agoMerge "Disable 554-jit-profile-file for unsupported test modes" am: 07e9dc8677
Calin Juravle [Wed, 2 Dec 2015 19:28:54 +0000 (19:28 +0000)]
Merge "Disable 554-jit-profile-file for unsupported test modes" am: 07e9dc8677
am: 20b1d97b00

* commit '20b1d97b00d4e1f12e9b43d67888b3afe516576a':
  Disable 554-jit-profile-file for unsupported test modes

8 years agoMerge "Disable 554-jit-profile-file for unsupported test modes"
Calin Juravle [Wed, 2 Dec 2015 19:24:37 +0000 (19:24 +0000)]
Merge "Disable 554-jit-profile-file for unsupported test modes"
am: 07e9dc8677

* commit '07e9dc8677f94d47a79e2bd02580525b183a5b88':
  Disable 554-jit-profile-file for unsupported test modes

8 years agoMerge "Disable 554-jit-profile-file for unsupported test modes"
Calin Juravle [Wed, 2 Dec 2015 19:21:20 +0000 (19:21 +0000)]
Merge "Disable 554-jit-profile-file for unsupported test modes"

8 years agoDisable 554-jit-profile-file for unsupported test modes
Calin Juravle [Wed, 2 Dec 2015 18:40:05 +0000 (18:40 +0000)]
Disable 554-jit-profile-file for unsupported test modes

Reasons:
- interpreter modes: the test needs JIT.
- no-dex2oat/no-prebuild: we only save profiling info for the primary
oat file. In these modes we don't create oat files and thus nothing is
saved.

Change-Id: I3b0574c0f39ee0db20803c021a6e827d96acd7c0

8 years agoMerge "ART: Support dlopen for a PIC boot image" am: 4f56abc276 am: 947d85aaa5
Andreas Gampe [Wed, 2 Dec 2015 19:16:31 +0000 (19:16 +0000)]
Merge "ART: Support dlopen for a PIC boot image" am: 4f56abc276 am: 947d85aaa5
am: c59cb949b7

* commit 'c59cb949b79fa722316b492abac4bbbb5039d6ce':
  ART: Support dlopen for a PIC boot image

8 years agoMerge "ART: Refactor oat_file.h/cc for better maintainability" am: dbec5e71e0 am...
Andreas Gampe [Wed, 2 Dec 2015 19:16:23 +0000 (19:16 +0000)]
Merge "ART: Refactor oat_file.h/cc for better maintainability" am: dbec5e71e0 am: 98acd60161
am: 4c4f22e5d4

* commit '4c4f22e5d4d9bf20f2d75e284473262331a5cf94':
  ART: Refactor oat_file.h/cc for better maintainability

8 years agoMerge "ART: Support dlopen for a PIC boot image" am: 4f56abc276
Andreas Gampe [Wed, 2 Dec 2015 19:10:08 +0000 (19:10 +0000)]
Merge "ART: Support dlopen for a PIC boot image" am: 4f56abc276
am: 947d85aaa5

* commit '947d85aaa5ecc5aba55cc5cc1a05d034d3c8c2ee':
  ART: Support dlopen for a PIC boot image

8 years agoMerge "ART: Refactor oat_file.h/cc for better maintainability" am: dbec5e71e0
Andreas Gampe [Wed, 2 Dec 2015 19:10:00 +0000 (19:10 +0000)]
Merge "ART: Refactor oat_file.h/cc for better maintainability" am: dbec5e71e0
am: 98acd60161

* commit '98acd601616fc18be193ec999265ebc579ccdfb9':
  ART: Refactor oat_file.h/cc for better maintainability

8 years agoMerge "ART: Support dlopen for a PIC boot image"
Andreas Gampe [Wed, 2 Dec 2015 19:06:41 +0000 (19:06 +0000)]
Merge "ART: Support dlopen for a PIC boot image"
am: 4f56abc276

* commit '4f56abc2766ff76c330cfa046c9a095501923e3f':
  ART: Support dlopen for a PIC boot image

8 years agoMerge "ART: Refactor oat_file.h/cc for better maintainability"
Andreas Gampe [Wed, 2 Dec 2015 19:06:33 +0000 (19:06 +0000)]
Merge "ART: Refactor oat_file.h/cc for better maintainability"
am: dbec5e71e0

* commit 'dbec5e71e0108cff373dce9e315a95a0187bc14f':
  ART: Refactor oat_file.h/cc for better maintainability

8 years agoMerge "ART: Support dlopen for a PIC boot image"
Andreas Gampe [Wed, 2 Dec 2015 19:02:29 +0000 (19:02 +0000)]
Merge "ART: Support dlopen for a PIC boot image"

8 years agoMerge "ART: Refactor oat_file.h/cc for better maintainability"
Andreas Gampe [Wed, 2 Dec 2015 19:01:46 +0000 (19:01 +0000)]
Merge "ART: Refactor oat_file.h/cc for better maintainability"

8 years agoMerge "Fix the order in which profiled methods are dumped." am: c1c2ce460b am: 85d5c74eed
Calin Juravle [Wed, 2 Dec 2015 18:37:56 +0000 (18:37 +0000)]
Merge "Fix the order in which profiled methods are dumped." am: c1c2ce460b am: 85d5c74eed
am: 394700afcb

* commit '394700afcb997424eb4a584965d25dbe95047cc3':
  Fix the order in which profiled methods are dumped.

8 years agoMerge "Fix the order in which profiled methods are dumped." am: c1c2ce460b
Calin Juravle [Wed, 2 Dec 2015 18:34:06 +0000 (18:34 +0000)]
Merge "Fix the order in which profiled methods are dumped." am: c1c2ce460b
am: 85d5c74eed

* commit '85d5c74eedcec842cbc7b11685320cea7e2be70f':
  Fix the order in which profiled methods are dumped.

8 years agoART: Support dlopen for a PIC boot image
Andreas Gampe [Wed, 2 Dec 2015 18:29:33 +0000 (10:29 -0800)]
ART: Support dlopen for a PIC boot image

Add support for the recent dlext extension for PIC support. Pass
the oat_file_begin to dlopen_ext as a reserved_addr using the new
LOAD_AT_FIXED_ADDRESS flag (when it isn't null).

Bug: 24683631
Change-Id: I59c5c82aebfa7cfb815e1fcf47fd72bec6f8239b

8 years agoART: Refactor oat_file.h/cc for better maintainability
Andreas Gampe [Wed, 2 Dec 2015 07:27:12 +0000 (23:27 -0800)]
ART: Refactor oat_file.h/cc for better maintainability

Refactor the code so that generic oat file initialization (checking
ART symbols etc) is common between dlopen and ART's ElfFile
implementation. Reduce methods and fields exposed in the oat_file
header.

Change-Id: I5bf65dd8b7047a007c6bf435b55bdde306595e8d

8 years agoMerge "Fix the order in which profiled methods are dumped."
Calin Juravle [Wed, 2 Dec 2015 18:29:14 +0000 (18:29 +0000)]
Merge "Fix the order in which profiled methods are dumped."
am: c1c2ce460b

* commit 'c1c2ce460b30940a4f4ce39c688f7b3d080d90f8':
  Fix the order in which profiled methods are dumped.

8 years agoMerge "Fix the order in which profiled methods are dumped."
Calin Juravle [Wed, 2 Dec 2015 18:22:30 +0000 (18:22 +0000)]
Merge "Fix the order in which profiled methods are dumped."

8 years agoFix the order in which profiled methods are dumped.
Calin Juravle [Wed, 2 Dec 2015 18:21:39 +0000 (18:21 +0000)]
Fix the order in which profiled methods are dumped.

This fixes flacky behaviour in tests.

Change-Id: I1b79111ad739ca9f3936110bce6719335b5ea112

8 years agoMerge "Fix test path in libarttest.mk" am: 777d18bc40 am: b73e2d6586
Calin Juravle [Wed, 2 Dec 2015 17:15:31 +0000 (17:15 +0000)]
Merge "Fix test path in libarttest.mk" am: 777d18bc40 am: b73e2d6586
am: 40ed32ae3e

* commit '40ed32ae3eaee093a7abfd9c43aafde5f0719eb8':
  Fix test path in libarttest.mk

8 years agoMerge "Fix test path in libarttest.mk" am: 777d18bc40
Calin Juravle [Wed, 2 Dec 2015 17:11:58 +0000 (17:11 +0000)]
Merge "Fix test path in libarttest.mk" am: 777d18bc40
am: b73e2d6586

* commit 'b73e2d6586373a330b9d5a9260381c499a3122f2':
  Fix test path in libarttest.mk

8 years agoMerge "Fix test path in libarttest.mk"
Calin Juravle [Wed, 2 Dec 2015 17:08:46 +0000 (17:08 +0000)]
Merge "Fix test path in libarttest.mk"
am: 777d18bc40

* commit '777d18bc400916a7b1c16177449b0fe0e3129012':
  Fix test path in libarttest.mk

8 years agoMerge "Fix test path in libarttest.mk"
Calin Juravle [Wed, 2 Dec 2015 17:03:39 +0000 (17:03 +0000)]
Merge "Fix test path in libarttest.mk"

8 years agoFix test path in libarttest.mk
Calin Juravle [Wed, 2 Dec 2015 17:03:06 +0000 (17:03 +0000)]
Fix test path in libarttest.mk

Change-Id: Ied98b5a407048d173e66f593fe0685d02a54d0f8

8 years agoMerge "Enable profiled guided compilation in dex2oat" am: ec92d4f902 am: ed3a23d4aa
Calin Juravle [Wed, 2 Dec 2015 16:44:11 +0000 (16:44 +0000)]
Merge "Enable profiled guided compilation in dex2oat" am: ec92d4f902 am: ed3a23d4aa
am: ccc2848dd1

* commit 'ccc2848dd1fd9e7291fe2b23a32d5776dd5001f9':
  Enable profiled guided compilation in dex2oat

8 years agoMerge "Enable profiled guided compilation in dex2oat" am: ec92d4f902
Calin Juravle [Wed, 2 Dec 2015 16:40:50 +0000 (16:40 +0000)]
Merge "Enable profiled guided compilation in dex2oat" am: ec92d4f902
am: ed3a23d4aa

* commit 'ed3a23d4aa1b602071882a83d4f08e6af32428aa':
  Enable profiled guided compilation in dex2oat

8 years agoMerge "Enable profiled guided compilation in dex2oat"
Calin Juravle [Wed, 2 Dec 2015 16:35:52 +0000 (16:35 +0000)]
Merge "Enable profiled guided compilation in dex2oat"
am: ec92d4f902

* commit 'ec92d4f90282f93d80d8cfc86e30381eed333a51':
  Enable profiled guided compilation in dex2oat

8 years agoMerge "Enable profiled guided compilation in dex2oat"
Calin Juravle [Wed, 2 Dec 2015 16:18:40 +0000 (16:18 +0000)]
Merge "Enable profiled guided compilation in dex2oat"

8 years agoEnable profiled guided compilation in dex2oat
Calin Juravle [Wed, 25 Nov 2015 15:59:14 +0000 (15:59 +0000)]
Enable profiled guided compilation in dex2oat

- add parsing of the profile info saved during JIT
- don't compile methods which are not part of the profile info.
- delete old profile hooks

Change-Id: I45a13c3aeb36265d335e57cd160b9ea0fab3cbb5

8 years agoMerge "Revert "Revert "Don\'t use the compiler driver for method resolution.""" am...
Nicolas Geoffray [Wed, 2 Dec 2015 14:49:16 +0000 (14:49 +0000)]
Merge "Revert "Revert "Don\'t use the compiler driver for method resolution.""" am: 47229aa584 am: d3f50dc4e3
am: a40335bcc7

* commit 'a40335bcc7952caccd8feb1ab6205eea9c61c8c1':
  Revert "Revert "Don't use the compiler driver for method resolution.""

8 years agoMerge "Revert "Revert "Don\'t use the compiler driver for method resolution.""" am...
Nicolas Geoffray [Wed, 2 Dec 2015 14:46:23 +0000 (14:46 +0000)]
Merge "Revert "Revert "Don\'t use the compiler driver for method resolution.""" am: 47229aa584
am: d3f50dc4e3

* commit 'd3f50dc4e3bd4207e2fd0f6efecb06d00c5ee6fe':
  Revert "Revert "Don't use the compiler driver for method resolution.""

8 years agoMerge "Revert "Revert "Don\'t use the compiler driver for method resolution."""
Nicolas Geoffray [Wed, 2 Dec 2015 14:43:30 +0000 (14:43 +0000)]
Merge "Revert "Revert "Don\'t use the compiler driver for method resolution."""
am: 47229aa584

* commit '47229aa5848df7d45578dbdd9285f57dfa9399a8':
  Revert "Revert "Don't use the compiler driver for method resolution.""

8 years agoMerge "Revert "Revert "Don't use the compiler driver for method resolution."""
Nicolas Geoffray [Wed, 2 Dec 2015 14:39:43 +0000 (14:39 +0000)]
Merge "Revert "Revert "Don't use the compiler driver for method resolution."""

8 years agoRevert "Revert "Don't use the compiler driver for method resolution.""
Nicolas Geoffray [Wed, 2 Dec 2015 09:06:11 +0000 (09:06 +0000)]
Revert "Revert "Don't use the compiler driver for method resolution.""

This reverts commit c88ef3a10c474045a3476a02ae75d07ddd3230b7.

Change-Id: I0ed88a48b313a8d28bc39fae40631123aadb13ef

8 years agoMerge "Clean up optimizing compiler stats" am: b5cdc5dfdb am: fc7ffe56bf
Calin Juravle [Wed, 2 Dec 2015 12:19:48 +0000 (12:19 +0000)]
Merge "Clean up optimizing compiler stats" am: b5cdc5dfdb am: fc7ffe56bf
am: 00fd9e431e

* commit '00fd9e431ed8b5ca1c9b4f71f9d196fb849695d3':
  Clean up optimizing compiler stats

8 years agoMerge "Clean up optimizing compiler stats" am: b5cdc5dfdb
Calin Juravle [Wed, 2 Dec 2015 12:16:52 +0000 (12:16 +0000)]
Merge "Clean up optimizing compiler stats" am: b5cdc5dfdb
am: fc7ffe56bf

* commit 'fc7ffe56bf8db9c9ac7a4ce2a73c59d8cb83f001':
  Clean up optimizing compiler stats

8 years agoMerge "Clean up optimizing compiler stats"
Calin Juravle [Wed, 2 Dec 2015 12:14:01 +0000 (12:14 +0000)]
Merge "Clean up optimizing compiler stats"
am: b5cdc5dfdb

* commit 'b5cdc5dfdbc68aa30625a1464c6378d43bb5941d':
  Clean up optimizing compiler stats

8 years agoMerge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""" am: d585b2c891...
David Brazdil [Wed, 2 Dec 2015 12:14:01 +0000 (12:14 +0000)]
Merge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""" am: d585b2c891 am: 642b96c61f
am: e8f98e9857

* commit 'e8f98e98572ece0ed91c226392625cf3a031382d':
  Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""

8 years agoMerge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""" am: d585b2c891
David Brazdil [Wed, 2 Dec 2015 12:11:11 +0000 (12:11 +0000)]
Merge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""" am: d585b2c891
am: 642b96c61f

* commit '642b96c61ff9cc59259b609650f6e0a8d1bb48b5':
  Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""