[GR-19220] Include the major kernel version in RUBY_PLATFORM on macOS like MRI (#1860).

PullRequest: truffleruby/1211

Author: eregon

CHANGELOG.md

@@ -70,6 +70,7 @@ Compatibility:
 * Implemented `Comparable#clamp` (#1517).
 * Implemented `rb_gc_register_mark_object` and `rb_enc_str_asciionly_p` (#1856, @chrisseaton).
 * Implemented `rb_io_set_nonblock` (#1741).
+* Include the major kernel version in `RUBY_PLATFORM` on macOS like MRI (#1860, @eightbitraptor).
 
 Performance:
 

mx.truffleruby/suite.py

@@ -121,6 +121,7 @@
             "dir": "src/annotations",
             "sourceDirs": ["java"],
             "javaCompliance": "8+",
+            "checkstyle": "org.truffleruby",
             "workingSets": "TruffleRuby",
             "checkPackagePrefix": "false",
             "license": ["EPL-2.0"],
@@ -137,6 +138,7 @@
                 "TRUFFLERUBY-PROCESSOR",
             ],
             "javaCompliance": "8+",
+            "checkstyle": "org.truffleruby",
             "workingSets": "TruffleRuby",
             "checkPackagePrefix": "false",
             "license": ["EPL-2.0"],
@@ -150,6 +152,7 @@
                 "truffle:TRUFFLE_API",
             ],
             "javaCompliance": "8+",
+            "checkstyle": "org.truffleruby",
             "workingSets": "TruffleRuby",
             "checkPackagePrefix": "false",
             "license": ["EPL-2.0"],
@@ -162,6 +165,7 @@
                 "sdk:GRAAL_SDK",
             ],
             "javaCompliance": "8+",
+            "checkstyle": "org.truffleruby",
             "workingSets": "TruffleRuby",
             "checkPackagePrefix": "false",
             "license": ["EPL-2.0"],
@@ -224,6 +228,7 @@
                 "sdk:LAUNCHER_COMMON",
             ],
             "javaCompliance": "8+",
+            "checkstyle": "org.truffleruby",
             "workingSets": "TruffleRuby",
             "checkPackagePrefix": "false",
             "license": ["EPL-2.0"],
@@ -238,6 +243,7 @@
                 "mx:JUNIT",
             ],
             "javaCompliance": "8+",
+            "checkstyle": "org.truffleruby",
             "checkPackagePrefix": "false",
             "license": ["EPL-2.0"],
         },
@@ -248,6 +254,7 @@
             "sourceDirs": ["java", "ruby"],
             "dependencies": ["truffle:TRUFFLE_TCK"],
             "javaCompliance": "8+",
+            "checkstyle": "org.truffleruby",
             "license": ["EPL-2.0"],
         },
 

spec/ruby/core/builtin_constants/builtin_constants_spec.rb

@@ -34,6 +34,13 @@
   it "is a String" do
     RUBY_PLATFORM.should be_kind_of(String)
   end
+
+  platform_is :darwin do
+    it 'contains the current kernel major version' do
+      kernel_version = `uname -r`
+      RUBY_PLATFORM.should =~ /#{kernel_version.split('.').first}/
+    end
+  end
 end
 
 describe "RUBY_RELEASE_DATE" do

src/main/java/org/truffleruby/RubyLanguage.java

@@ -64,7 +64,11 @@
 })
 public class RubyLanguage extends TruffleLanguage<RubyContext> {
 
-    public static final String PLATFORM = String.format("%s-%s", Platform.getArchitecture(), Platform.getOSName());
+    public static final String PLATFORM = String.format(
+            "%s-%s%s",
+            Platform.getArchitecture(),
+            Platform.getOSName(),
+            Platform.getKernelMajorVersion());
 
     public static final String LLVM_BITCODE_MIME_TYPE = "application/x-llvm-ir-bitcode";
 

src/processor/java/org/truffleruby/processor/BuildInformationProcessor.java

@@ -50,6 +50,7 @@ public class BuildInformationProcessor extends AbstractProcessor {
     private int rubyRevision;
     private String revision;
     private String compileDate;
+    private String kernelMajorVersion;
 
     @Override
     public synchronized void init(ProcessingEnvironment env) {
@@ -61,11 +62,17 @@ public synchronized void init(ProcessingEnvironment env) {
             rubyRevision = Integer.parseInt(runCommand("tool/query-versions-json.rb ruby.revision"));
             revision = runCommand("git rev-parse --short=8 HEAD");
             compileDate = runCommand("git log -1 --date=short --pretty=format:%cd");
+            kernelMajorVersion = findKernelMajorVersion();
         } catch (Throwable e) {
             throw new Error(e);
         }
     }
 
+    private String findKernelMajorVersion() throws IOException, InterruptedException {
+        final String kernelVersion = runCommand("uname -r");
+        return kernelVersion.split(Pattern.quote("."))[0];
+    }
+
     private File findHome() throws URISyntaxException {
         final CodeSource codeSource = getClass().getProtectionDomain().getCodeSource();
         final File jarOrClassPath;
@@ -159,7 +166,7 @@ private void processBuildInformation(TypeElement element) throws Exception {
             stream.println("package " + packageName + ";");
             stream.println();
             stream.println("// GENERATED BY " + getClass().getName());
-            stream.println("// This file is automatically generated from versions.json");
+            stream.println("// This file is automatically generated from versions.json and other sources");
             stream.println();
             stream.println(
                     "public class " + element.getSimpleName() + SUFFIX + " implements " + element.getSimpleName() +
@@ -199,6 +206,9 @@ private void processBuildInformation(TypeElement element) throws Exception {
                             case "getCompileDate":
                                 value = compileDate;
                                 break;
+                            case "getKernelMajorVersion":
+                                value = kernelMajorVersion;
+                                break;
                             default:
                                 throw new UnsupportedOperationException(name + " method not understood");
                         }

src/shared/java/org/truffleruby/shared/BasicPlatform.java

@@ -95,4 +95,12 @@ public static String getArchitecture() {
 
         return architecture;
     }
+
+    public static String getKernelMajorVersion() {
+        if (OS == OS_TYPE.DARWIN) {
+            return BuildInformationImpl.INSTANCE.getKernelMajorVersion();
+        } else {
+            return "";
+        }
+    }
 }

src/shared/java/org/truffleruby/shared/BuildInformation.java

@@ -24,4 +24,6 @@ public interface BuildInformation {
 
     String getCompileDate();
 
+    String getKernelMajorVersion();
+
 }

tool/jt.rb

@@ -1875,6 +1875,11 @@ def bootstrap_toolchain
     raise 'use --env jvm-ce instead' if options.delete('--graal')
     raise 'use --env native instead' if options.delete('--native')
 
+    if os_version_changed?
+      warn "Kernel version changed since last build: #{build_kernel_ver.inspect} -> #{host_kernel_ver.inspect}"
+      remove_shared_compile_artifacts
+    end
+
     env = if (i = options.index('--env') || options.index('-e'))
             options.delete_at i
             options.delete_at i
@@ -1905,6 +1910,7 @@ def bootstrap_toolchain
     mx_args = ['-p', TRUFFLERUBY_DIR, '--env', env, *mx_options]
 
     env = ENV['JT_CACHE_TOOLCHAIN'] ? { 'SULONG_BOOTSTRAP_GRAALVM' => bootstrap_toolchain } : {}
+
     mx(env, *mx_args, 'build', *mx_build_options)
     build_dir = mx(*mx_args, 'graalvm-home', capture: true).lines.last.chomp
 
@@ -1945,6 +1951,40 @@ def bootstrap_toolchain
     end
   end
 
+  def remove_shared_compile_artifacts
+    if build_information_path.file?
+      warn "Deleting shared build artifacts to trigger rebuild: #{shared_path}"
+      shared_path.rmtree
+    end
+  end
+
+  def os_version_changed?
+    build_kernel_ver != host_kernel_ver
+  end
+
+  def host_kernel_ver
+    `uname -r`[/^\d+/]
+  end
+
+  def build_kernel_ver
+    return '' unless build_information_path.file?
+
+    build_information = build_information_path.readlines
+    build_os_ver_loc  = build_information.index { |l| l.include?('getKernelMajorVersion') }
+    return '' unless build_os_ver_loc
+
+    build_information[build_os_ver_loc + 1][/^\d+/]
+  end
+
+  def shared_path
+    Pathname.new("#{TRUFFLERUBY_DIR}/mxbuild/org.truffleruby.shared")
+  end
+
+  def build_information_path
+    shared_path
+      .join('src_gen/org/truffleruby/shared/BuildInformationImpl.java')
+  end
+
   def next(*args)
     puts `cat spec/tags/core/**/**.txt | grep 'fails:'`.lines.sample
   end