.mx.jvmci/mx_jvmci.py

rev 12604 : 8173912: [JVMCI] fix memory overhead of JVMCI

*** 156,167 ****
      jdkBuildDir = _get_jdk_build_dir()
      if not exists(jdkBuildDir):
          # JDK9 must be bootstrapped with a JDK8
          compliance = mx.JavaCompliance('8')
          jdk8 = mx.get_jdk(compliance.exactMatch, versionDescription=compliance.value)
!         cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=external', '--disable-precompiled-headers',
!                '--with-jvm-variants=' + _vm.jvmVariant, '--disable-warnings-as-errors', '--with-boot-jdk=' + jdk8.home]
          mx.run(cmd, cwd=_jdkSourceRoot)
      cmd = [mx.gmake_cmd(), 'CONF=' + _vm.debugLevel]
      if mx.get_opts().verbose:
          cmd.append('LOG=debug')
      cmd.extend(args)
--- 156,167 ----
      jdkBuildDir = _get_jdk_build_dir()
      if not exists(jdkBuildDir):
          # JDK9 must be bootstrapped with a JDK8
          compliance = mx.JavaCompliance('8')
          jdk8 = mx.get_jdk(compliance.exactMatch, versionDescription=compliance.value)
!         cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=external', '--disable-precompiled-headers', '--with-jvm-features=graal',
!                '--with-jvm-variants=' + _vm.jvmVariant, '--disable-warnings-as-errors', '--with-boot-jdk=' + jdk8.home, '--with-jvm-features=graal']
          mx.run(cmd, cwd=_jdkSourceRoot)
      cmd = [mx.gmake_cmd(), 'CONF=' + _vm.debugLevel]
      if mx.get_opts().verbose:
          cmd.append('LOG=debug')
      cmd.extend(args)
*** 174,243 ****
          mx.log('Command line: ' + ' '.join(cmd))
          mx.log('-----------------------------------------------------')
  
      mx.run(cmd, cwd=_jdkSourceRoot)
  
-     if 'images' in cmd:
-         jdkImageDir = join(jdkBuildDir, 'images', 'jdk')
- 
-         # The OpenJDK build creates an empty cacerts file so copy one from
-         # the default JDK (which is assumed to be an OracleJDK)
-         srcCerts = join(mx.get_jdk(tag='default').home, 'lib', 'security', 'cacerts')
-         if not exists(srcCerts):
-             # Might be building with JDK8 which has cacerts under jre/
-             srcCerts = join(mx.get_jdk(tag='default').home, 'jre', 'lib', 'security', 'cacerts')
-         dstCerts = join(jdkImageDir, 'lib', 'security', 'cacerts')
-         if srcCerts != dstCerts:
-             shutil.copyfile(srcCerts, dstCerts)
- 
-         _create_jdk_bundle(jdkBuildDir, _vm.debugLevel, jdkImageDir)
- 
- def _get_jdk_bundle_arches():
-     """
-     Gets a list of names that will be the part of a JDK bundle's file name denoting the architecture.
-     The first element in the list is the canonical name. Symlinks should be created for the
-     remaining names.
-     """
-     cpu = mx.get_arch()
-     if cpu == 'amd64':
-         return ['x64', 'x86_64', 'amd64']
-     elif cpu == 'sparcv9':
-         return ['sparcv9']
-     mx.abort('Unsupported JDK bundle arch: ' + cpu)
- 
- def _create_jdk_bundle(jdkBuildDir, debugLevel, jdkImageDir):
-     """
-     Creates a tar.gz JDK archive, an accompanying tar.gz.sha1 file with its
-     SHA1 signature plus symlinks to the archive for non-canonical architecture names.
-     """
- 
-     arches = _get_jdk_bundle_arches()
-     jdkTgzPath = join(_suite.get_output_root(), 'jdk-bundles', 'jdk9-{}-{}-{}.tar.gz'.format(debugLevel, _get_openjdk_os(), arches[0]))
-     with mx.Archiver(jdkTgzPath, kind='tgz') as arc:
-         mx.log('Creating ' + jdkTgzPath)
-         for root, _, filenames in os.walk(jdkImageDir):
-             for name in filenames:
-                 f = join(root, name)
-                 arcname = 'jdk1.9.0/' + os.path.relpath(f, jdkImageDir)
-                 arc.zf.add(name=f, arcname=arcname, recursive=False)
- 
-     with open(jdkTgzPath + '.sha1', 'w') as fp:
-         mx.log('Creating ' + jdkTgzPath + '.sha1')
-         fp.write(mx.sha1OfFile(jdkTgzPath))
- 
-     def _create_link(source, link_name):
-         if exists(link_name):
-             os.remove(link_name)
-         mx.log('Creating ' + link_name + ' -> ' + source)
-         os.symlink(source, link_name)
- 
-     for arch in arches[1:]:
-         link_name = join(_suite.get_output_root(), 'jdk-bundles', 'jdk9-{}-{}-{}.tar.gz'.format(debugLevel, _get_openjdk_os(), arch))
-         jdkTgzName = os.path.basename(jdkTgzPath)
-         _create_link(jdkTgzName, link_name)
-         _create_link(jdkTgzName + '.sha1', link_name + '.sha1')
- 
  def _runmultimake(args):
      """run the JDK make process for one or more configurations"""
  
      jvmVariantsDefault = ','.join(_jdkJvmVariants)
      debugLevelsDefault = ','.join(_jdkDebugLevels)
--- 174,183 ----