Optimize CodeGen for executable jar

cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/BuildCommand.java

@@ -198,6 +198,13 @@ public BuildCommand() {
             "generation")
     private String graalVMBuildOptions;
 
+    @CommandLine.Option(names = "--optimize", description = "generate optimized executable jar", defaultValue = "false")
+    private Boolean optimizeCodegen;
+
+    @CommandLine.Option(names = "--optimize-report", description = "generate code generation optimization reports",
+            defaultValue = "false")
+    private Boolean optimizeReport;
+
     @Override
     public void execute() {
         long start = 0;
@@ -283,8 +290,8 @@ public void execute() {
                 // resolve maven dependencies in Ballerina.toml
                 .addTask(new ResolveMavenDependenciesTask(outStream))
                 // compile the modules
-                .addTask(new CompileTask(outStream, errStream, false, true,
-                        isPackageModified, buildOptions.enableCache()))
+                .addTask(new CompileTask(outStream, errStream, false, true, false, isPackageModified,
+                        buildOptions.enableCache()))
                 .addTask(new CreateExecutableTask(outStream, this.output, null, false))
                 .addTask(new DumpBuildTimeTask(outStream), !project.buildOptions().dumpBuildTime())
                 .build();
@@ -317,7 +324,9 @@ private BuildOptions constructBuildOptions() {
                 .setNativeImage(nativeImage)
                 .disableSyntaxTreeCaching(disableSyntaxTreeCaching)
                 .setGraalVMBuildOptions(graalVMBuildOptions)
-                .setShowDependencyDiagnostics(showDependencyDiagnostics);
+                .setShowDependencyDiagnostics(showDependencyDiagnostics)
+                .setOptimizeCodegen(optimizeCodegen)
+                .setOptimizeReport(optimizeReport);
 
         if (targetDir != null) {
             buildOptionsBuilder.targetDir(targetDir.toString());

cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PackCommand.java

@@ -260,8 +260,8 @@ public void execute() {
                 .addTask(new CleanTargetDirTask(isPackageModified, buildOptions.enableCache()), isSingleFileBuild)
                 .addTask(new RunBuildToolsTask(outStream), isSingleFileBuild)
                 .addTask(new ResolveMavenDependenciesTask(outStream))
-                .addTask(new CompileTask(outStream, errStream, true, false,
-                        isPackageModified, buildOptions.enableCache()))
+                .addTask(new CompileTask(outStream, errStream, true, false, false, isPackageModified,
+                        buildOptions.enableCache()))
                 .addTask(new CreateBalaTask(outStream))
                 .addTask(new DumpBuildTimeTask(outStream), !project.buildOptions().dumpBuildTime())
                 .build();

cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/ProfileCommand.java

@@ -195,7 +195,7 @@ private TaskExecutor createTaskExecutor(boolean isPackageModified, String[] args
                 .addTask(new CleanTargetDirTask(isPackageModified, buildOptions.enableCache()), isSingleFileBuild)
                 .addTask(new RunBuildToolsTask(outStream), isSingleFileBuild)
                 .addTask(new ResolveMavenDependenciesTask(outStream))
-                .addTask(new CompileTask(outStream, errStream, false, false, isPackageModified,
+                .addTask(new CompileTask(outStream, errStream, false, false, false, isPackageModified,
                         buildOptions.enableCache()))
                 .addTask(new CreateExecutableTask(outStream, null, null, false), false)
                 .addTask(new DumpBuildTimeTask(outStream), false)

cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java

@@ -262,8 +262,8 @@ public void execute() {
                 // resolve maven dependencies in Ballerina.toml
                 .addTask(new ResolveMavenDependenciesTask(outStream))
                 // compile the modules
-                .addTask(new CompileTask(outStream, errStream, false, false,
-                        isPackageModified, buildOptions.enableCache()))
+                .addTask(new CompileTask(outStream, errStream, false, false, false, isPackageModified,
+                        buildOptions.enableCache()))
 //                .addTask(new CopyResourcesTask(), isSingleFileBuild)
                 .addTask(new CreateExecutableTask(outStream, null, target, true))
                 .addTask(new RunExecutableTask(args, outStream, errStream, target))

cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java

@@ -209,6 +209,12 @@ public TestCommand() {
     @CommandLine.Option(names = "--cloud", description = "Enable cloud artifact generation")
     private String cloud;
 
+    @CommandLine.Option(names = "--optimize", description = "generate optimized executable jar", defaultValue = "false")
+    private Boolean optimizeCodegen;
+
+    @CommandLine.Option(names = "--optimize-report", description = "generate code generation optimization reports",
+            defaultValue = "false")
+    private Boolean optimizeReport;
 
     private static final String testCmd = "bal test [--OPTIONS]\n" +
             "                   [<ballerina-file> | <package-path>] [(-Ckey=value)...]";
@@ -374,8 +380,8 @@ public void execute() {
         TaskExecutor taskExecutor = new TaskExecutor.TaskBuilder()
                 .addTask(new ResolveMavenDependenciesTask(outStream)) // resolve maven dependencies in Ballerina.toml
                 // compile the modules
-                .addTask(new CompileTask(outStream, errStream, false, false,
-                        isPackageModified, buildOptions.enableCache()))
+                .addTask(new CompileTask(outStream, errStream, false, false, true, isPackageModified,
+                        buildOptions.enableCache()))
 //                .addTask(new CopyResourcesTask(), listGroups) // merged with CreateJarTask
                 .addTask(new CreateTestExecutableTask(outStream, groupList, disableGroupList, testList, listGroups,
                                 cliArgs, isParallelExecution),
@@ -415,7 +421,9 @@ private BuildOptions constructBuildOptions() {
                 .setEnableCache(enableCache)
                 .disableSyntaxTreeCaching(disableSyntaxTreeCaching)
                 .setGraalVMBuildOptions(graalVMBuildOptions)
-                .setShowDependencyDiagnostics(showDependencyDiagnostics);
+                .setShowDependencyDiagnostics(showDependencyDiagnostics)
+                .setOptimizeCodegen(optimizeCodegen)
+                .setOptimizeReport(optimizeReport);
 
         if (targetDir != null) {
             buildOptionsBuilder.targetDir(targetDir.toString());

cli/ballerina-cli/src/main/java/io/ballerina/cli/task/CompileTask.java

@@ -19,6 +19,7 @@
 package io.ballerina.cli.task;
 
 import io.ballerina.cli.utils.BuildTime;
+import io.ballerina.projects.BuildOptions;
 import io.ballerina.projects.CodeGeneratorResult;
 import io.ballerina.projects.CodeModifierResult;
 import io.ballerina.projects.JBallerinaBackend;
@@ -64,23 +65,26 @@ public class CompileTask implements Task {
     private final transient PrintStream err;
     private final boolean compileForBalPack;
     private final boolean compileForBalBuild;
+    private final boolean compileForBalTest;
     private final boolean isPackageModified;
     private final boolean cachesEnabled;
 
     public CompileTask(PrintStream out, PrintStream err) {
-        this(out, err, false, false, true, false);
+        this(out, err, false, false, false, true, false);
     }
 
     public CompileTask(PrintStream out,
                        PrintStream err,
                        boolean compileForBalPack,
                        boolean compileForBalBuild,
+                       boolean compileForBalTest,
                        boolean isPackageModified,
                        boolean cachesEnabled) {
         this.out = out;
         this.err = err;
         this.compileForBalPack = compileForBalPack;
         this.compileForBalBuild = compileForBalBuild;
+        this.compileForBalTest = compileForBalTest;
         this.isPackageModified = isPackageModified;
         this.cachesEnabled = cachesEnabled;
     }
@@ -112,6 +116,10 @@ public void execute(Project project) {
             if (this.compileForBalBuild) {
                 addDiagnosticForProvidedPlatformLibs(project, diagnostics);
             }
+            if (this.compileForBalBuild || this.compileForBalTest) {
+                addDiagnosticForInvalidOptimizeReportFlagUsage(project, diagnostics);
+            }
+
             long start = 0;
 
             if (project.currentPackage().compilationOptions().dumpGraph()
@@ -329,6 +337,17 @@ private void addDiagnosticForProvidedPlatformLibs(Project project, List<Diagnost
         }
     }
 
+    private void addDiagnosticForInvalidOptimizeReportFlagUsage(Project project, List<Diagnostic> diagnostics) {
+        BuildOptions buildOptions = project.buildOptions();
+        if (buildOptions.optimizeReport() && !buildOptions.optimizeCodegen()) {
+            DiagnosticInfo diagnosticInfo = new DiagnosticInfo(
+                    ProjectDiagnosticErrorCode.INVALID_VERBOSE_FLAG_USAGE.diagnosticId(),
+                    "--optimize-report flag can only be used with --optimize flag", DiagnosticSeverity.ERROR);
+            diagnostics.add(new PackageDiagnostic(diagnosticInfo,
+                    project.currentPackage().descriptor().name().toString()));
+        }
+    }
+
     /**
      * If CompileTask is triggered by `bal pack` command, and project does not have CompilerPlugin.toml or BalTool.toml,
      * skip the compilation if project is empty. The project should be evaluated for emptiness before calling this.

cli/ballerina-cli/src/main/java/io/ballerina/cli/task/CreateExecutableTask.java

@@ -41,6 +41,7 @@
 import static io.ballerina.cli.launcher.LauncherUtils.createLauncherException;
 import static io.ballerina.cli.utils.FileUtils.getFileNameWithoutExtension;
 import static io.ballerina.projects.util.ProjectConstants.BLANG_COMPILED_JAR_EXT;
+import static io.ballerina.projects.util.ProjectConstants.BYTECODE_OPTIMIZED_JAR_SUFFIX;
 import static io.ballerina.projects.util.ProjectConstants.USER_DIR;
 
 /**
@@ -93,6 +94,8 @@ public void execute(Project project) {
                     out.println(warnings);
                 }
                 emitResult = jBallerinaBackend.emit(JBallerinaBackend.OutputType.GRAAL_EXEC, executablePath);
+            } else if (project.buildOptions().optimizeCodegen()) {
+                emitResult = jBallerinaBackend.emit(JBallerinaBackend.OutputType.OPTIMIZE_CODEGEN, executablePath);
             } else {
                 emitResult = jBallerinaBackend.emit(JBallerinaBackend.OutputType.EXEC, executablePath);
             }
@@ -119,7 +122,7 @@ public void execute(Project project) {
             throw createLauncherException(e.getMessage());
         }
 
-        if (!project.buildOptions().nativeImage() && !isHideTaskOutput) {
+        if (!project.buildOptions().nativeImage() && !isHideTaskOutput && !project.buildOptions().optimizeCodegen()) {
             Path relativePathToExecutable = currentDir.relativize(executablePath);
 
             if (project.buildOptions().getTargetPath() != null) {
@@ -134,6 +137,25 @@ public void execute(Project project) {
             }
         }
 
+        if (project.buildOptions().optimizeCodegen()) {
+            Path relativePathToExecutable = currentDir.relativize(executablePath);
+            String relativePathToExecutableString =
+                    relativePathToExecutable.toString().replace(BLANG_COMPILED_JAR_EXT, BYTECODE_OPTIMIZED_JAR_SUFFIX);
+            String executablePathString =
+                    executablePath.toString().replace(BLANG_COMPILED_JAR_EXT, BYTECODE_OPTIMIZED_JAR_SUFFIX);
+
+            if (project.buildOptions().getTargetPath() != null) {
+                this.out.println("\t" + relativePathToExecutableString);
+            } else {
+                if (relativePathToExecutableString.contains("..")
+                        || relativePathToExecutableString.contains("." + File.separator)) {
+                    this.out.println("\t" + executablePathString);
+                } else {
+                    this.out.println("\t" + relativePathToExecutableString);
+                }
+            }
+        }
+
         // notify plugin
         // todo following call has to be refactored after introducing new plugin architecture
         BuildUtils.notifyPlugins(project, target);

cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunExecutableTask.java

@@ -108,4 +108,3 @@ private void runGeneratedExecutable(Project project) {
         }
     }
 }
-

cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/TestUtils.java

@@ -484,6 +484,7 @@ public static String getClassPath(JBallerinaBackend jBallerinaBackend, Package c
 
         List<Path> jarList = getModuleJarPaths(jBallerinaBackend, currentPackage);
         dependencies.removeAll(jarList);
+        dependencies.removeAll(jarResolver.optimizedJarLibraryPaths);
 
         StringJoiner classPath = joinClassPaths(dependencies);
         return classPath.toString();

compiler/ballerina-lang/build.gradle

@@ -29,6 +29,7 @@ dependencies {
     implementation "org.apache.commons:commons-compress:${project.apacheCommonsCompressVersion}"
     implementation 'io.netty:netty-buffer'
     implementation 'org.ow2.asm:asm'
+    implementation "org.ow2.asm:asm-tree:${project.ow2AsmTreeVersion}"
     implementation 'commons-io:commons-io'
     implementation 'com.github.zafarkhaja:java-semver'
     testImplementation ("guru.nidi:graphviz-java") {
@@ -71,6 +72,7 @@ processResources {
     include 'ballerina-toml-schema.json'
     include 'compiler.properties'
     include 'dependencies-toml-schema.json'
+    include 'interop-dependencies.properties'
     include 'old-dependencies-toml-schema.json'
     include 'settings-toml-schema.json'
     include 'bal-tools-toml-schema.json'

compiler/ballerina-lang/src/main/java/io/ballerina/projects/BuildOptions.java

@@ -138,6 +138,14 @@ public boolean showDependencyDiagnostics() {
         return toBooleanDefaultIfNull(this.showDependencyDiagnostics);
     }
 
+    public boolean optimizeCodegen() {
+        return this.compilationOptions.optimizeCodegen();
+    }
+
+    public boolean optimizeReport() {
+        return this.compilationOptions.optimizeReport();
+    }
+
     /**
      * Merge the given build options by favoring theirs if there are conflicts.
      *
@@ -211,6 +219,8 @@ public BuildOptions acceptTheirs(BuildOptions theirOptions) {
         buildOptionsBuilder.setExportOpenAPI(compilationOptions.exportOpenAPI);
         buildOptionsBuilder.setExportComponentModel(compilationOptions.exportComponentModel);
         buildOptionsBuilder.setEnableCache(compilationOptions.enableCache);
+        buildOptionsBuilder.setOptimizeCodegen(compilationOptions.optimizeCodegen);
+        buildOptionsBuilder.setOptimizeReport(compilationOptions.optimizeReport);
         buildOptionsBuilder.setRemoteManagement(compilationOptions.remoteManagement);
 
         return buildOptionsBuilder.build();
@@ -250,7 +260,9 @@ public enum OptionName {
         NATIVE_IMAGE("graalvm"),
         EXPORT_COMPONENT_MODEL("exportComponentModel"),
         GRAAL_VM_BUILD_OPTIONS("graalvmBuildOptions"),
-        SHOW_DEPENDENCY_DIAGNOSTICS("showDependencyDiagnostics");
+        SHOW_DEPENDENCY_DIAGNOSTICS("showDependencyDiagnostics"),
+        OPTIMIZE_CODEGEN("optimizeCodegen"),
+        OPTIMIZE_REPORT("optimizeReport");
 
         private final String name;
 
@@ -406,11 +418,21 @@ public BuildOptionsBuilder setNativeImage(Boolean value) {
             return this;
         }
 
+        public BuildOptionsBuilder setOptimizeCodegen(Boolean value) {
+            compilationOptionsBuilder.setOptimizeCodegen(value);
+            return this;
+        }
+
         public BuildOptionsBuilder setRemoteManagement(Boolean value) {
             compilationOptionsBuilder.setRemoteManagement(value);
             return this;
         }
 
+        public BuildOptionsBuilder setOptimizeReport(Boolean value) {
+            compilationOptionsBuilder.setOptimizeReport(value);
+            return this;
+        }
+
         public BuildOptionsBuilder setShowDependencyDiagnostics(Boolean value) {
             showDependencyDiagnostics = value;
             return this;