*** old/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Fri Jul  7 09:29:21 2017
--- new/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Fri Jul  7 09:29:21 2017

*** 68,86 ****
--- 68,86 ----
        "dependencies" : [],
        "uses" : [],
        "exports" : [
          "<package-info>",  # exports all packages containing package-info.java
        ],
-       "checkstyle" : "org.graalvm.api.word",
        "javaCompliance" : "1.8",
        "workingSets" : "API,SDK",
      },
-     "org.graalvm.api.word" : {
        "subDir" : "share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [],
-       "checkstyle" : "org.graalvm.api.word",
        "javaCompliance" : "1.8",
        "workingSets" : "API,SDK",
      },
  
      # ------------- Graal -------------

*** 140,151 ****
--- 140,150 ----
      "org.graalvm.compiler.debug" : {
        "subDir" : "share/classes",
        "sourceDirs" : ["src"],
        "checkstyle" : "org.graalvm.compiler.graph",
        "uses" : [
!         "org.graalvm.compiler.debug.DebugConfigCustomizer",
          "org.graalvm.compiler.debug.DebugInitializationParticipant",
!         "org.graalvm.compiler.debug.DebugHandlersFactory",
          "org.graalvm.compiler.debug.TTYStreamProvider",
        ],
        "dependencies" : [
          "JVMCI_API",
          "org.graalvm.compiler.serviceprovider",

*** 790,799 ****
--- 789,828 ----
        "checkstyle" : "org.graalvm.compiler.graph",
        "javaCompliance" : "1.8",
        "workingSets" : "Graal,Phases",
      },
  
+     "org.graalvm.compiler.virtual.bench" : {
+       "subDir" : "share/classes",
+       "sourceDirs" : ["src"],
+       "dependencies" : ["mx:JMH_1_18", "org.graalvm.compiler.microbenchmarks"],
+       "checkstyle" : "org.graalvm.compiler.graph",
+       "javaCompliance" : "1.8",
+       "annotationProcessors" : ["mx:JMH_1_18"],
+       "findbugsIgnoresGenerated" : True,
+       "workingSets" : "Graal,Bench",
+       "isTestProject" : True,
+     },
+ 
+     "org.graalvm.compiler.microbenchmarks" : {
+       "subDir" : "share/classes",
+       "sourceDirs" : ["src"],
+       "dependencies" : [
+         "mx:JMH_1_18",
+         "org.graalvm.compiler.api.test",
+         "org.graalvm.compiler.java",
+         "org.graalvm.compiler.runtime",
+       ],
+       "checkstyle" : "org.graalvm.compiler.graph",
+       "javaCompliance" : "1.8",
+       "checkPackagePrefix" : "false",
+       "annotationProcessors" : ["mx:JMH_1_18"],
+       "findbugsIgnoresGenerated" : True,
+       "workingSets" : "Graal,Bench",
+       "isTestProject" : True,
+     },
+ 
      "org.graalvm.compiler.loop" : {
        "subDir" : "share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : ["org.graalvm.compiler.nodes"],
        "annotationProcessors" : ["GRAAL_OPTIONS_PROCESSOR"],

*** 968,978 ****
--- 997,1007 ----
      "org.graalvm.compiler.core.common" : {
        "subDir" : "share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "org.graalvm.compiler.debug",
-         "org.graalvm.api.word",
        ],
        "annotationProcessors" : ["GRAAL_OPTIONS_PROCESSOR"],
        "checkstyle" : "org.graalvm.compiler.graph",
        "javaCompliance" : "1.8",
        "workingSets" : "Graal,Java",

*** 996,1005 ****
--- 1025,1035 ----
  
      "org.graalvm.compiler.test" : {
        "subDir" : "share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
+         "org.graalvm.compiler.debug",
          "org.graalvm.util",
          "mx:JUNIT",
        ],
        "checkstyle" : "org.graalvm.compiler.graph",
        "javaCompliance" : "1.8",