.mx.jvmci/suite.py

*** 128,138 ****
        "checkstyle" : "jdk.vm.ci.services",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI",
      },
  
!     # ------------- JVMCI:HotSpot -------------
  
      "jdk.vm.ci.aarch64" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : ["jdk.vm.ci.code"],
--- 128,138 ----
        "checkstyle" : "jdk.vm.ci.services",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI",
      },
  
!     # ------------- JVMCI:Generic -------------
  
      "jdk.vm.ci.aarch64" : {
        "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : ["jdk.vm.ci.code"],
*** 157,168 ****
        "checkstyle" : "jdk.vm.ci.services",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,SPARC",
      },
  
      "jdk.vm.ci.hotspot" : {
!       "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.hotspotvmconfig",
          "jdk.vm.ci.common",
          "jdk.vm.ci.inittimer",
--- 157,170 ----
        "checkstyle" : "jdk.vm.ci.services",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,SPARC",
      },
  
+     # ------------- JVMCI:HotSpot -------------
+ 
      "jdk.vm.ci.hotspot" : {
!       "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.hotspotvmconfig",
          "jdk.vm.ci.common",
          "jdk.vm.ci.inittimer",
*** 186,204 ****
        "javaCompliance" : "1.8",
        "workingSets" : "API,JVMCI",
      },
  
      "jdk.vm.ci.hotspotvmconfig" : {
!       "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "checkstyle" : "jdk.vm.ci.services",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,HotSpot",
      },
  
      "jdk.vm.ci.hotspot.aarch64" : {
!       "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.aarch64",
          "jdk.vm.ci.hotspot",
        ],
--- 188,206 ----
        "javaCompliance" : "1.8",
        "workingSets" : "API,JVMCI",
      },
  
      "jdk.vm.ci.hotspotvmconfig" : {
!       "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
        "sourceDirs" : ["src"],
        "checkstyle" : "jdk.vm.ci.services",
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,HotSpot",
      },
  
      "jdk.vm.ci.hotspot.aarch64" : {
!       "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.aarch64",
          "jdk.vm.ci.hotspot",
        ],
*** 206,216 ****
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,HotSpot,AArch64",
      },
  
      "jdk.vm.ci.hotspot.amd64" : {
!       "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.amd64",
          "jdk.vm.ci.hotspot",
        ],
--- 208,218 ----
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,HotSpot,AArch64",
      },
  
      "jdk.vm.ci.hotspot.amd64" : {
!       "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.amd64",
          "jdk.vm.ci.hotspot",
        ],
*** 218,228 ****
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,HotSpot,AMD64",
      },
  
      "jdk.vm.ci.hotspot.sparc" : {
!       "subDir" : "src/jdk.vm.ci/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.sparc",
          "jdk.vm.ci.hotspot",
        ],
--- 220,230 ----
        "javaCompliance" : "1.8",
        "workingSets" : "JVMCI,HotSpot,AMD64",
      },
  
      "jdk.vm.ci.hotspot.sparc" : {
!       "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
        "sourceDirs" : ["src"],
        "dependencies" : [
          "jdk.vm.ci.sparc",
          "jdk.vm.ci.hotspot",
        ],
*** 260,277 ****
          "JVMCI_SERVICES",
        ],
      },
  
      "JVMCI_HOTSPOTVMCONFIG" : {
!       "subDir" : "src/jdk.vm.ci/share/classes",
        "dependencies" : [
          "jdk.vm.ci.hotspotvmconfig",
        ],
      },
  
      "JVMCI_HOTSPOT" : {
!       "subDir" : "src/jdk.vm.ci/share/classes",
        "dependencies" : [
          "jdk.vm.ci.hotspot.aarch64",
          "jdk.vm.ci.hotspot.amd64",
          "jdk.vm.ci.hotspot.sparc",
        ],
--- 262,279 ----
          "JVMCI_SERVICES",
        ],
      },
  
      "JVMCI_HOTSPOTVMCONFIG" : {
!       "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
        "dependencies" : [
          "jdk.vm.ci.hotspotvmconfig",
        ],
      },
  
      "JVMCI_HOTSPOT" : {
!       "subDir" : "src/jdk.vm.ci.hotspot/share/classes",
        "dependencies" : [
          "jdk.vm.ci.hotspot.aarch64",
          "jdk.vm.ci.hotspot.amd64",
          "jdk.vm.ci.hotspot.sparc",
        ],