Mercurial > hg > graal-compiler
diff mx/suite.py @ 21733:27943aac2e3c
Merge
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Thu, 04 Jun 2015 11:08:12 -0700 |
parents | edafbaef3059 |
children | b54b13157d4b |
line wrap: on
line diff
--- a/mx/suite.py Thu Jun 04 10:46:23 2015 -0700 +++ b/mx/suite.py Thu Jun 04 11:08:12 2015 -0700 @@ -3,6 +3,8 @@ "name" : "graal", "libraries" : { + # ------------- Libraries ------------- + "JLINE" : { "path" : "lib/jline-2.11.jar", "urls" : [ @@ -153,14 +155,28 @@ }, "projects" : { + + # ------------- JVMCI:Service ------------- + "com.oracle.jvmci.service" : { "subDir" : "graal", "sourceDirs" : ["src"], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", - "workingSets" : "API,Graal", + "workingSets" : "API,JVMCI", }, + "com.oracle.jvmci.service.processor" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : ["com.oracle.jvmci.service"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,Codegen,HotSpot", + }, + + # ------------- JVMCI:API ------------- + "com.oracle.jvmci.common" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -169,6 +185,23 @@ "workingSets" : "API,JVMCI", }, + "com.oracle.jvmci.meta" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "API,JVMCI", + }, + + "com.oracle.jvmci.code" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : ["com.oracle.jvmci.meta"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "API,JVMCI", + }, + "com.oracle.jvmci.runtime" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -180,6 +213,97 @@ "workingSets" : "API,JVMCI", }, + "com.oracle.jvmci.runtime.test" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "JUNIT", + "com.oracle.jvmci.common", + "com.oracle.jvmci.runtime", + ], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "API,JVMCI", + }, + + "com.oracle.jvmci.debug" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "checkstyle" : "com.oracle.graal.graph", + "dependencies" : [ + "com.oracle.jvmci.service", + ], + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,Debug", + }, + + "com.oracle.jvmci.debug.test" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "JUNIT", + "com.oracle.jvmci.debug", + ], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,Debug,Test", + }, + + "com.oracle.jvmci.options" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.service", + ], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI", + }, + + "com.oracle.jvmci.options.processor" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.options", + ], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,Codegen", + }, + + "com.oracle.jvmci.options.test" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.options", + "JUNIT", + ], + "checkstyle" : "com.oracle.graal.graph", + "annotationProcessors" : ["com.oracle.jvmci.options.processor"], + "javaCompliance" : "1.8", + "workingSets" : "JVMCI", + }, + + # ------------- JVMCI:HotSpot ------------- + + "com.oracle.jvmci.amd64" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : ["com.oracle.jvmci.code"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,AMD64", + }, + + "com.oracle.jvmci.sparc" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : ["com.oracle.jvmci.code"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,SPARC", + }, + "com.oracle.jvmci.hotspot" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -200,6 +324,65 @@ "workingSets" : "JVMCI", }, + "com.oracle.jvmci.hotspotvmconfig" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,HotSpot", + }, + + "com.oracle.jvmci.hotspotvmconfig.processor" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : ["com.oracle.jvmci.hotspotvmconfig", "com.oracle.jvmci.common"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,HotSpot,Codegen", + }, + + "com.oracle.jvmci.hotspot.amd64" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.amd64", + "com.oracle.jvmci.hotspot", + ], + "checkstyle" : "com.oracle.graal.graph", + "annotationProcessors" : ["com.oracle.jvmci.service.processor"], + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,HotSpot,AMD64", + }, + + "com.oracle.jvmci.hotspot.sparc" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.sparc", + "com.oracle.jvmci.hotspot", + ], + "checkstyle" : "com.oracle.graal.graph", + "annotationProcessors" : ["com.oracle.jvmci.service.processor"], + "javaCompliance" : "1.8", + "workingSets" : "JVMCI,HotSpot,SPARC", + }, + + "com.oracle.jvmci.hotspot.jfr" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.hotspot", + "JFR", + ], + "checkstyle" : "com.oracle.graal.graph", + "annotationProcessors" : ["com.oracle.jvmci.service.processor"], + "javaCompliance" : "1.8", + "profile" : "", + "workingSets" : "JVMCI,HotSpot", + }, + + # ------------- NFI ------------- + "com.oracle.nfi" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -220,6 +403,21 @@ "javaCompliance" : "1.7", }, + # ------------- Graal ------------- + + "com.oracle.graal.code" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.jvmci.service", + "com.oracle.jvmci.code", + ], + "annotationProcessors" : ["com.oracle.jvmci.service.processor"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "Graal", + }, + "com.oracle.graal.api.collections" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -270,23 +468,6 @@ "workingSets" : "API,Graal,Test", }, - "com.oracle.jvmci.meta" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "API,JVMCI", - }, - - "com.oracle.jvmci.code" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.jvmci.meta"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "API,JVMCI", - }, - "com.oracle.graal.api.replacements" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -296,50 +477,6 @@ "workingSets" : "API,Graal,Replacements", }, - "com.oracle.jvmci.service.processor" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.jvmci.service"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Codegen,HotSpot", - }, - - "com.oracle.graal.amd64" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.jvmci.code"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,AMD64", - }, - - "com.oracle.graal.sparc" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.jvmci.code"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,SPARC", - }, - - "com.oracle.jvmci.hotspotvmconfig" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "JVMCI,HotSpot", - }, - - "com.oracle.jvmci.hotspotvmconfig.processor" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.jvmci.hotspotvmconfig", "com.oracle.jvmci.common"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,HotSpot,Codegen", - }, - "com.oracle.graal.hotspot" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -358,24 +495,11 @@ "workingSets" : "Graal,HotSpot", }, - "com.oracle.jvmci.hotspot.jfr" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.jvmci.hotspot", - "JFR", - ], - "checkstyle" : "com.oracle.graal.graph", - "annotationProcessors" : ["com.oracle.jvmci.service.processor"], - "javaCompliance" : "1.8", - "profile" : "", - "workingSets" : "JVMCI,HotSpot", - }, - "com.oracle.graal.hotspot.amd64" : { "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ + "com.oracle.jvmci.hotspot.amd64", "com.oracle.graal.compiler.amd64", "com.oracle.graal.hotspot", "com.oracle.graal.replacements.amd64", @@ -390,6 +514,8 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ + "com.oracle.graal.hotspot", + "com.oracle.jvmci.hotspot.sparc", "com.oracle.graal.compiler.sparc", "com.oracle.graal.replacements.sparc", ], @@ -423,41 +549,6 @@ "workingSets" : "Graal,HotSpot,AMD64,Test", }, - "com.oracle.jvmci.options" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.jvmci.service", - ], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "JVMCI", - }, - - "com.oracle.jvmci.options.processor" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.jvmci.options", - ], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "JVMCI,Codegen", - }, - - "com.oracle.jvmci.options.test" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.jvmci.options", - "JUNIT", - ], - "checkstyle" : "com.oracle.graal.graph", - "annotationProcessors" : ["com.oracle.jvmci.options.processor"], - "javaCompliance" : "1.8", - "workingSets" : "JVMCI", - }, - "com.oracle.graal.nodeinfo" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -504,27 +595,71 @@ "workingSets" : "Graal,Graph,Test", }, - "com.oracle.jvmci.debug" : { + "com.oracle.graal.asm" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : ["com.oracle.jvmci.code"], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "Graal,Assembler", + }, + + "com.oracle.graal.asm.amd64" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.graal.asm", + "com.oracle.jvmci.amd64", + ], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "Graal,Assembler,AMD64", + }, + + "com.oracle.graal.asm.sparc" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.graal.asm", + "com.oracle.jvmci.sparc", + ], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "Graal,Assembler,SPARC", + }, + + "com.oracle.graal.bytecode" : { "subDir" : "graal", "sourceDirs" : ["src"], "checkstyle" : "com.oracle.graal.graph", - "dependencies" : [ - "com.oracle.jvmci.service", - ], "javaCompliance" : "1.8", - "workingSets" : "JVMCI,Debug", + "workingSets" : "Graal,Java", }, - "com.oracle.jvmci.debug.test" : { + "com.oracle.graal.asm.test" : { "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ - "JUNIT", - "com.oracle.jvmci.debug", + "com.oracle.graal.code", + "com.oracle.graal.test", + "com.oracle.jvmci.runtime", ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", - "workingSets" : "JVMCI,Debug,Test", + "workingSets" : "Graal,Assembler,Test", + }, + + "com.oracle.graal.asm.amd64.test" : { + "subDir" : "graal", + "sourceDirs" : ["src"], + "dependencies" : [ + "com.oracle.graal.asm.test", + "com.oracle.jvmci.common", + "com.oracle.graal.asm.amd64", + ], + "checkstyle" : "com.oracle.graal.graph", + "javaCompliance" : "1.8", + "workingSets" : "Graal,Assembler,AMD64,Test", }, "com.oracle.graal.lir" : { @@ -577,7 +712,10 @@ "com.oracle.graal.lir.sparc" : { "subDir" : "graal", "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.graal.asm.sparc"], + "dependencies" : [ + "com.oracle.graal.asm.sparc", + "com.oracle.graal.lir", + ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", "workingSets" : "Graal,LIR,SPARC", @@ -781,7 +919,7 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ - "com.oracle.graal.amd64", + "com.oracle.jvmci.amd64", "com.oracle.graal.lir.jtt", ], "checkstyle" : "com.oracle.graal.graph", @@ -792,7 +930,10 @@ "com.oracle.graal.compiler.sparc" : { "subDir" : "graal", "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.graal.lir.sparc"], + "dependencies" : [ + "com.oracle.graal.compiler", + "com.oracle.graal.lir.sparc" + ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", "workingSets" : "Graal,SPARC", @@ -802,7 +943,7 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ - "com.oracle.graal.sparc", + "com.oracle.jvmci.sparc", "com.oracle.graal.compiler.test", ], "checkstyle" : "com.oracle.graal.graph", @@ -819,14 +960,6 @@ "workingSets" : "Graal", }, - "com.oracle.graal.bytecode" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,Java", - }, - "com.oracle.graal.java" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -844,8 +977,7 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ - "JUNIT", - "com.oracle.graal.runtime", + "com.oracle.jvmci.runtime.test", "com.oracle.graal.java", ], "checkstyle" : "com.oracle.graal.graph", @@ -884,6 +1016,7 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ + "com.oracle.graal.code", "com.oracle.graal.java", "com.oracle.graal.compiler", ], @@ -896,8 +1029,8 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ + "com.oracle.jvmci.debug", "JUNIT", - "com.oracle.jvmci.debug", ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", @@ -908,8 +1041,8 @@ "subDir" : "graal", "sourceDirs" : ["src"], "dependencies" : [ + "com.oracle.graal.test", "com.oracle.graal.api.directives", - "com.oracle.graal.test", "com.oracle.graal.printer", "com.oracle.graal.runtime", "JAVA_ALLOCATION_INSTRUMENTER", @@ -932,62 +1065,7 @@ "jacoco" : "exclude", }, - "com.oracle.graal.asm" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : ["com.oracle.jvmci.code"], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,Assembler", - }, - - "com.oracle.graal.asm.test" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.graal.test", - "com.oracle.graal.runtime", - ], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,Assembler,Test", - }, - - "com.oracle.graal.asm.amd64" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.graal.asm", - "com.oracle.graal.amd64", - ], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,Assembler,AMD64", - }, - - "com.oracle.graal.asm.amd64.test" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.graal.asm.test", - "com.oracle.graal.asm.amd64", - ], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,Assembler,AMD64,Test", - }, - - "com.oracle.graal.asm.sparc" : { - "subDir" : "graal", - "sourceDirs" : ["src"], - "dependencies" : [ - "com.oracle.graal.hotspot", - "com.oracle.graal.sparc", - ], - "checkstyle" : "com.oracle.graal.graph", - "javaCompliance" : "1.8", - "workingSets" : "Graal,Assembler,SPARC", - }, + # ------------- Truffle ------------- "com.oracle.truffle.api" : { "subDir" : "graal", @@ -1006,6 +1084,7 @@ ], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.7", + "annotationProcessors" : ["com.oracle.truffle.dsl.processor"], "workingSets" : "API,Truffle,Test", "jacoco" : "exclude", }, @@ -1092,7 +1171,7 @@ "sourceDirs" : ["src"], "dependencies" : ["com.oracle.truffle.api"], "checkstyle" : "com.oracle.truffle.api", - "javaCompliance" : "1.8", + "javaCompliance" : "1.7", "workingSets" : "Truffle,Tools", }, @@ -1167,6 +1246,8 @@ "workingSets" : "Truffle,SimpleLanguage,Tools", }, + # ------------- GraalTruffle ------------- + "com.oracle.graal.truffle" : { "subDir" : "graal", "sourceDirs" : ["src"], @@ -1240,6 +1321,8 @@ "distributions" : { + # ------------- Distributions ------------- + "JVMCI_SERVICE" : { "path" : "build/jvmci-service.jar", "subDir" : "graal", @@ -1269,7 +1352,8 @@ "subDir" : "graal", "sourcesPath" : "build/jvmci-hotspot.src.zip", "dependencies" : [ - "com.oracle.jvmci.hotspot", + "com.oracle.jvmci.hotspot.amd64", + "com.oracle.jvmci.hotspot.sparc", "com.oracle.jvmci.hotspot.jfr", ], "distDependencies" : [ @@ -1303,6 +1387,7 @@ "com.oracle.nfi", "com.oracle.truffle.interop", "com.oracle.truffle.object.basic", + "com.oracle.truffle.tools" ], "distDependencies" : [ "JVMCI_SERVICE",