Mercurial > hg > graal-jvmci-8
changeset 19896:6dcbb4e05ce9
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 16 Mar 2015 21:50:15 +0100 |
| parents | c3d9637c98ed (diff) f803f49c9ec4 (current diff) |
| children | 0b5036d27c02 |
| files | graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCompare.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BitManipulationOp.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Compare.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64TestMemoryOp.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64TestOp.java |
| diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/compiler/compileBroker.cpp Mon Mar 16 13:47:45 2015 +0100 +++ b/src/share/vm/compiler/compileBroker.cpp Mon Mar 16 21:50:15 2015 +0100 @@ -801,12 +801,6 @@ GraalCompiler* graal = new GraalCompiler(); #endif -#ifdef COMPILER1 - if (c1_count > 0) { - _compilers[0] = new Compiler(); - } -#endif // COMPILER1 - #if defined(COMPILERGRAAL) _compilers[1] = graal; if (FLAG_IS_DEFAULT(GraalThreads)) { @@ -817,8 +811,18 @@ } else { c2_count = GraalThreads; } + if (FLAG_IS_DEFAULT(GraalHostThreads)) { + } else { + c1_count = GraalHostThreads; + } #endif // COMPILERGRAAL +#ifdef COMPILER1 + if (c1_count > 0) { + _compilers[0] = new Compiler(); + } +#endif // COMPILER1 + #ifdef COMPILER2 if (c2_count > 0) { _compilers[1] = new C2Compiler();
--- a/src/share/vm/graal/graalGlobals.hpp Mon Mar 16 13:47:45 2015 +0100 +++ b/src/share/vm/graal/graalGlobals.hpp Mon Mar 16 21:50:15 2015 +0100 @@ -61,6 +61,9 @@ COMPILERGRAAL_PRESENT(product(intx, GraalThreads, 1, \ "Force number of Graal compiler threads to use")) \ \ + COMPILERGRAAL_PRESENT(product(intx, GraalHostThreads, 1, \ + "Force number of compiler threads for Graal host compiler")) \ + \ GRAAL_ONLY(product(bool, CodeInstallSafepointChecks, true, \ "Perform explicit safepoint checks while installing code")) \ \