Merge pull request #1817 from github/nickrolfe/evaluator-intra-layer-…

…parallelism-ff Use feature flag to enable evaluator intra-layer parallelism
github · Jul 31, 2023 · cf445f7 · cf445f7
2 parents 81ae676 + 2f8540d
commit cf445f7
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 ## [UNRELEASED]
 
-No user facing changes.
+- We are rolling out a feature in August 2023 that will improve multi-threaded performance on larger runners. [#1817](https://github.com/github/codeql-action/pull/1817)
 
 ## 2.21.2 - 28 Jul 2023
 

diff --git a/lib/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/feature-flags.js b/lib/feature-flags.js
diff --git a/lib/feature-flags.js.map b/lib/feature-flags.js.map
diff --git a/src/analyze.ts b/src/analyze.ts
@@ -487,6 +487,7 @@ export async function runQueries(
       querySuitePath,
       queryFlags,
       optimizeForLastQueryRun,
+      features,
     );
 
     logger.debug(`BQRS results produced for ${language} (queries: ${type})"`);
@@ -521,6 +522,7 @@ export async function runQueries(
       querySuitePath,
       queryFlags,
       optimizeForLastQueryRun,
+      features,
     );
 
     return querySuitePath;

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -160,6 +160,7 @@ export interface CodeQL {
     querySuitePath: string | undefined,
     flags: string[],
     optimizeForLastQueryRun: boolean,
+    features: FeatureEnablement,
   ): Promise<void>;
   /**
    * Run 'codeql database interpret-results'.
@@ -756,6 +757,7 @@ export async function getCodeQLForCmd(
       querySuitePath: string | undefined,
       flags: string[],
       optimizeForLastQueryRun: boolean,
+      features: FeatureEnablement,
     ): Promise<void> {
       const codeqlArgs = [
         "database",
@@ -778,6 +780,14 @@ export async function getCodeQLForCmd(
       if (querySuitePath) {
         codeqlArgs.push(querySuitePath);
       }
+      if (
+        await features.getValue(
+          Feature.EvaluatorIntraLayerParallelismEnabled,
+          this,
+        )
+      ) {
+        codeqlArgs.push("--intra-layer-parallelism");
+      }
       await runTool(cmd, codeqlArgs);
     },
     async databaseInterpretResults(

diff --git a/src/feature-flags.ts b/src/feature-flags.ts
@@ -46,6 +46,7 @@ export enum Feature {
   CliConfigFileEnabled = "cli_config_file_enabled",
   DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
   DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
+  EvaluatorIntraLayerParallelismEnabled = "evaluator_intra_layer_parallelism_enabled",
   ExportDiagnosticsEnabled = "export_diagnostics_enabled",
   MlPoweredQueriesEnabled = "ml_powered_queries_enabled",
   NewAnalysisSummaryEnabled = "new_analysis_summary_enabled",
@@ -68,6 +69,11 @@ export const featureConfig: Record<
     minimumVersion: "2.11.6",
     defaultValue: true,
   },
+  [Feature.EvaluatorIntraLayerParallelismEnabled]: {
+    envVar: "CODEQL_EVALUATOR_INTRA_LAYER_PARALLELISM",
+    minimumVersion: "2.14.0",
+    defaultValue: false,
+  },
   [Feature.ExportDiagnosticsEnabled]: {
     envVar: "CODEQL_ACTION_EXPORT_DIAGNOSTICS",
     minimumVersion: "2.12.4",