[GR-44721] [GR-44635] Documentation: Replace GraalVM Enterprise with Oracle GraalVM.

PullRequest: truffleruby/3689

Author: LesiaChaban

README.md

@@ -131,8 +131,8 @@ If you find any performance issue, please see [this guide](doc/user/reporting-pe
 
 TruffleRuby has the same version and is released at the same time as GraalVM.
 See the [release roadmap](https://www.graalvm.org/release-notes/version-roadmap/) for the release dates and information about how long releases are supported.
-GraalVM CE releases are supported at most one year.
-[Longer support](https://docs.oracle.com/en/graalvm/enterprise/22/docs/release-calendar/) is available for GraalVM EE.
+GraalVM Community Edition releases are supported at most one year.
+[Longer support](https://docs.oracle.com/en/graalvm/enterprise/22/docs/release-calendar/) is available for Oracle GraalVM.
 
 ## Migration from MRI
 

SECURITY.md

@@ -1,12 +1,12 @@
 # Reporting Security Vulnerabilities
 
-The GraalVM team values the independent security research community and believes that responsible disclosure of security vulnerabilities in GraalVM Community Edition as well as GraalVM Enterprise Edition helps us ensure the security and privacy of all our users.
+The GraalVM team values the independent security research community and believes that responsible disclosure of security vulnerabilities in GraalVM helps us ensure the security and privacy of all our users.
 
 If you believe you have found a security vulnerability, please submit a report to secalert_us@oracle.com preferably with a proof of concept. Please refer to [Reporting Vulnerabilities](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html) for additional information including our public encryption key for secure email. We ask that you do not contact project contributors directly or through other channels about a report.
 
 ### Security Updates, Alerts and Bulletins
 
-GraalVM Community Edition security updates will be released on a quarterly basis in conjunction withe GraalVM Enterprise Edition security updates that are part of the Oracle Critical Patch Update program. Security updates are released on the Tuesday closest to the 17th day of January, April, July and October. A pre-release announcement will be published on the Thursday preceding each Critical Patch Update release. For additional information including past advisories, please refer to [Security Alerts](https://www.oracle.com/security-alerts/).
+GraalVM Community Edition security updates will be released on a quarterly basis in conjunction with Oracle GraalVM security updates that are part of the Oracle Critical Patch Update program. Security updates are released on the Tuesday closest to the 17th day of January, April, July and October. A pre-release announcement will be published on the Thursday preceding each Critical Patch Update release. For additional information including past advisories, please refer to [Security Alerts](https://www.oracle.com/security-alerts/).
 
 ### Security-Related Information
 

ci.jsonnet

@@ -208,6 +208,7 @@ local part_definitions = {
     host_inlining_log: {
       # Same as in mx.truffleruby/native-host-inlining
       mx_options+:: [
+        "--extra-image-builder-argument=env.EXTRA_IMAGE_BUILDER_ARGUMENTS",
         "--extra-image-builder-argument=rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase",
         "--extra-image-builder-argument=rubyvm:-H:+TruffleHostInliningPrintExplored",
         "--extra-image-builder-argument=rubyvm:-Dgraal.LogFile=host-inlining.txt",

doc/user/benchmarking.md

@@ -12,9 +12,11 @@ This document lists the most important points to consider when benchmarking Truf
 
 We expect anyone publishing benchmark numbers about TruffleRuby to follow these guidelines.
 
-### Use TruffleRuby EE
+### Use Oracle GraalVM
 
-Use TruffleRuby EE, it is faster than CE overall and represents what TruffleRuby is capable of.
+Use [Oracle GraalVM](installing-graalvm.md) (before 23.0: GraalVM EE), it is faster than GraalVM CE overall and represents what TruffleRuby is capable of.
+
+Use `ruby --version` to ensure that you are running Oracle GraalVM.
 
 ### Use the Latest Release
 

doc/user/faq.md

@@ -71,17 +71,23 @@ See the Contact section of this [README](../../README.md#contact) page.
 
 ### How do I know if I'm using a VM that has the GraalVM compiler?
 
-`ruby --version` will report `GraalVM CE` or `EE`.
+`ruby --version` will report `GraalVM CE` or `Oracle GraalVM`.
+TruffleRuby versions before 23.0 report `GraalVM EE` instead of `Oracle GraalVM`.
 
 Also, `TruffleRuby.jit?` will tell you if you are running with the GraalVM compiler.
 
+### What is Oracle GraalVM?
+
+Oracle GraalVM is the new GraalVM distribution from Oracle and the successor of GraalVM Enterprise Edition, which used to be reported as `GraalVM EE`.
+
 ### How do I know that I'm using the Community Edition of GraalVM?
 
 `ruby --version` will report `GraalVM CE`.
 
-### How do I know that I'm using the Enterprise Edition of GraalVM?
+### How do I know that I'm using Oracle GraalVM?
 
-`ruby --version` will report `GraalVM EE`.
+`ruby --version` will report `Oracle GraalVM`.
+TruffleRuby versions before 23.0 report `GraalVM EE` instead.
 
 ### How do I know that I'm using the native version of TruffleRuby?
 
@@ -114,7 +120,7 @@ Benchmarks that we haven't looked at yet may require new code paths to be specia
 Currently we've added specialization for the code paths in the benchmarks and applications that we've been using.
 Adding them is generally not complicated and over time we will have specializations to cover a broad range of applications.
 
-Make sure that you are using the [Enterprise Edition of GraalVM, and have rebuilt the executable images](installing-graalvm.md) for the best performance.
+Make sure that you are using [Oracle GraalVM, and have rebuilt the executable images](installing-graalvm.md) for the best performance.
 
 ### How is this related to `invokedynamic`?
 

doc/user/installing-graalvm.md

@@ -14,9 +14,9 @@ Installing GraalVM enables you to run TruffleRuby both in the `--native` and `--
 
 [TruffleRuby's dependencies](../../README.md#dependencies) need to be installed for TruffleRuby to run correctly.
 
-## Community Edition and Enterprise Edition
+## GraalVM Community Edition and Oracle GraalVM
 
-GraalVM is available in a Community Edition, which is open-source, and an Enterprise Edition which has better performance and scalability.
+GraalVM is available in a Community Edition, which is open-source, and [Oracle GraalVM](https://www.oracle.com/graalvm/) which has better performance, footprint and scalability.
 See [the website](https://www.graalvm.org/downloads) for a comparison.
 
 ## Installing the Base Image
@@ -25,9 +25,9 @@ GraalVM starts with a base image which provides the platform for high-performanc
 
 The Community Edition base image can be installed [from GitHub](https://www.graalvm.org/downloads), under an open source licence.
 
-The Enterprise Edition base image can be installed from [Oracle Downloads](https://www.oracle.com/downloads/graalvm-downloads.html) page by accepting the Oracle License Agreement.
+Install the Oracle GraalVM base image from the [Oracle Downloads](https://www.oracle.com/downloads/graalvm-downloads.html) page by accepting the Oracle License Agreement.
 
-Nightly builds of the GraalVM Community Edition are [also available](https://github.com/graalvm/graalvm-ce-dev-builds/releases).
+GraalVM Community Developer Builds are [also available](https://github.com/graalvm/graalvm-ce-dev-builds/releases).
 
 Whichever edition you choose, you will obtain a tarball which you can extract.
 There will be a `bin` directory (`Contents/Home/bin` on macOS) which you can add to your `$PATH` if you want to.
@@ -54,8 +54,8 @@ The path of the script will be:
 languages/ruby/lib/truffle/post_install_hook.sh
 ```
 
-You can also download the latest Ruby component (`ruby-installable-...`) manually from [GitHub](https://github.com/oracle/truffleruby/releases/latest) (CE)
-or from [Oracle Downloads](https://www.oracle.com/downloads/graalvm-downloads.html) (EE).
+You can also download the latest Ruby component (`ruby-installable-...`) manually from [GitHub](https://github.com/oracle/truffleruby/releases/latest) for GraalVM CE
+or from [Oracle Downloads](https://www.oracle.com/downloads/graalvm-downloads.html) for Oracle GraalVM.
 Then install it with `gu install --file path/to/ruby-installable-...`.
 
 ## Using a Ruby Manager

doc/user/reporting-performance-problems.md

@@ -23,9 +23,9 @@ are not needed or loops that contain no work.
 
 All of these issues make it hard to benchmark TruffleRuby. This is not a problem that is unique to us - it applies to many sophisticated virtual machines - but most Ruby implementations are not yet performing optimizations powerful enough to show these problems, so they may be new to some people in the Ruby community.
 
-## Using the Enterprise Edition of GraalVM
+## Using Oracle GraalVM
 
-To experiment with how fast TruffleRuby can be, we recommend using the [Enterprise Edition of GraalVM](installing-graalvm.md).
+To experiment with how fast TruffleRuby can be, use [Oracle GraalVM](installing-graalvm.md).
 
 ## Using the JVM Configuration
 

mx.truffleruby/env_files.md

@@ -1,10 +1,10 @@
 Here is how the various env files relate to each other:
 * `jvm`
-  * `jvm-ce`: + Graal CE
+  * `jvm-ce`: + GraalVM CE Compiler
     * `jvm-ce-ntl`: + native toolchain launchers
       * `jvm-ce-libgraal`: + libgraal
       * `native`: + librubyvm
-  * `jvm-ee`: + Graal EE
+  * `jvm-ee`: + Oracle GraalVM Compiler
     * `jvm-ee-ntl`: + native toolchain launchers
       * `jvm-ee-libgraal`: + libgraal
       * `native-ee`: + librubyvm

spec/truffle/identity_spec.rb

@@ -38,15 +38,15 @@
 
   guard -> { !TruffleRuby.native? } do
     it "RUBY_DESCRIPTION indicates which VM TruffleRuby runs on and which edition" do
-      RUBY_DESCRIPTION.should =~ /\b(Interpreted|GraalVM CE|GraalVM EE|Oracle GraalVM) JVM\b/
+      RUBY_DESCRIPTION.should =~ /\b(Interpreted|GraalVM CE|Oracle GraalVM) JVM\b/
       RUBY_DESCRIPTION.should_not include("Native")
       RUBY_DESCRIPTION.should_not include("native")
     end
   end
 
   guard -> { TruffleRuby.native? } do
     it "RUBY_DESCRIPTION indicates TruffleRuby runs on SVM and which edition" do
-      RUBY_DESCRIPTION.should =~ /\b(GraalVM CE|GraalVM EE|Oracle GraalVM) Native\b/
+      RUBY_DESCRIPTION.should =~ /\b(GraalVM CE|Oracle GraalVM) Native\b/
       RUBY_DESCRIPTION.should_not include("JVM")
     end
   end

spec/truffle/launcher_spec.rb

@@ -440,29 +440,29 @@ def should_print_full_java_command(options, env: {})
           out = ruby_exe('puts RUBY_DESCRIPTION; puts Truffle::System.get_java_property("foo")', env: env, args: @redirect)
           check_status_and_empty_stderr
           out = out.lines.map(&:chomp)
-          out[0].should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) JVM/
+          out[0].should =~ /(GraalVM CE|Oracle GraalVM) JVM/
           out[1].should == 'bar'
         end
       end
 
       it "uses --native by default" do
         out = ruby_exe(nil, options: "--version", args: @redirect)
         check_status_and_empty_stderr
-        out.should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) Native/
+        out.should =~ /(GraalVM CE|Oracle GraalVM) Native/
       end
 
       it "switches to JVM with --jvm as a Ruby argument" do
         out = ruby_exe(nil, options: "--jvm #{@ignore_jvm_thread_warnings} --version", args: @redirect)
         check_status_and_empty_stderr
-        out.should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) JVM/
+        out.should =~ /(GraalVM CE|Oracle GraalVM) JVM/
       end
 
       it "keeps --jvm as an application argument if given as an application argument" do
         script = fixture(__FILE__, "argv.rb")
         out = ruby_exe(nil, options: "-v", args: "#{script} --jvm 1 2 #{@redirect}")
         check_status_and_empty_stderr
         out = out.lines.map(&:chomp)
-        out[0].should =~ /(GraalVM CE|GraalVM EE|Oracle GraalVM) Native/
+        out[0].should =~ /(GraalVM CE|Oracle GraalVM) Native/
         out.should.include?('["--jvm", "1", "2"]')
       end
     end