change use of data.js

Author: mateuszpn

devops/scripts/benchmarks/.gitignore

@@ -1 +1,2 @@
 /html/data.js
+/html/flamegraphs.js

devops/scripts/benchmarks/benches/base.py

@@ -195,7 +195,9 @@ def run_bench(
             raise
 
         if self.traceable(TracingType.FLAMEGRAPH) and run_flamegraph and perf_data_file:
-            svg_file = get_flamegraph().handle_output(self.name(), perf_data_file)
+            svg_file = get_flamegraph().handle_output(
+                self.name(), perf_data_file, self.get_suite_name()
+            )
             log.info(f"FlameGraph generated: {svg_file}")
 
         if use_stdout:

devops/scripts/benchmarks/html/index.html

@@ -14,6 +14,7 @@
     <script src="https://cdn.jsdelivr.net/npm/chartjs-adapter-date-fns"></script>
     <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-annotation"></script>
     <script src="data.js"></script>
+    <script src="flamegraphs.js"></script>
     <script src="config.js"></script>
     <script src="chart-annotations.js"></script>
     <script src="scripts.js"></script>

devops/scripts/benchmarks/html/scripts.js

@@ -114,6 +114,7 @@ function createRunElement(name) {
 }
 
 function addSelectedRun() {
+    if (!runSelect) return; // Safety check for DOM element
     const selectedRun = runSelect.value;
     if (selectedRun && !activeRuns.has(selectedRun)) {
         activeRuns.add(selectedRun);
@@ -1331,12 +1332,19 @@ function initializeCharts() {
     console.log('Layer comparisons data processed:', layerComparisonsData.length, 'items');
 
     allRunNames = [...new Set(loadedBenchmarkRuns.map(run => run.name))];
+    
+    // In flamegraph-only mode, ensure we include runs from flamegraph data
+    if (validateFlameGraphData()) {
+        const flamegraphRunNames = Object.keys(flamegraphData.runs);
+        allRunNames = [...new Set([...allRunNames, ...flamegraphRunNames])];
+    }
+    
     latestRunsLookup = createLatestRunsLookup();
     console.log('Run names and lookup created. Runs:', allRunNames);
 
     // Check if we have actual benchmark results vs flamegraph-only results
     const hasActualBenchmarks = loadedBenchmarkRuns.some(run => 
-        run.results && run.results.some(result => result.suite !== 'flamegraph')
+        run.results && run.results.length > 0 && run.results.some(result => result.suite !== 'flamegraph')
     );
 
     const hasFlameGraphResults = loadedBenchmarkRuns.some(run => 
@@ -1346,7 +1354,14 @@ function initializeCharts() {
     console.log('Benchmark analysis:', {
         hasActualBenchmarks,
         hasFlameGraphResults,
-        loadedBenchmarkRuns: loadedBenchmarkRuns.length
+        loadedBenchmarkRuns: loadedBenchmarkRuns.length,
+        runDetails: loadedBenchmarkRuns.map(run => ({
+            name: run.name,
+            resultCount: run.results ? run.results.length : 0,
+            hasResults: run.results && run.results.length > 0
+        })),
+        flamegraphValidation: validateFlameGraphData(),
+        flamegraphRunCount: validateFlameGraphData() ? Object.keys(flamegraphData.runs).length : 0
     });
 
     // If we only have flamegraph results (no actual benchmark data), create synthetic data
@@ -1408,6 +1423,12 @@ function initializeCharts() {
     } else {
         // No runs parameter, use defaults
         activeRuns = new Set(defaultCompareNames || []);
+        
+        // If no default runs and we're in flamegraph-only mode, use all available runs
+        if (activeRuns.size === 0 && !hasActualBenchmarks && hasFlameGraphResults) {
+            activeRuns = new Set(allRunNames);
+            console.log('Flamegraph-only mode: auto-selected all available runs:', Array.from(activeRuns));
+        }
     }
 
     // Setup UI components
@@ -1779,36 +1800,33 @@ function createSyntheticFlameGraphData(flamegraphLabels) {
 
     // Create synthetic benchmark results for each flamegraph
     flamegraphLabels.forEach(label => {
-        // Try to determine suite from metadata, default to "Flamegraphs"
-        const metadata = metadataForLabel(label, 'benchmark');
-        let suite = 'Flamegraphs';
+        // Get suite from flamegraphData - this should always be available
+        let suite = null;
 
-        // Try to match with existing metadata to get proper suite name
-        if (metadata) {
-            // Most flamegraphs are likely from Compute Benchmarks
-            suite = 'Compute Benchmarks';
-        } else {
-            // For common benchmark patterns, assume Compute Benchmarks
-            const computeBenchmarkPatterns = [
-                'SubmitKernel', 'SubmitGraph', 'FinalizeGraph', 'SinKernelGraph',
-                'AllocateBuffer', 'CopyBuffer', 'CopyImage', 'CreateBuffer',
-                'CreateContext', 'CreateImage', 'CreateKernel', 'CreateProgram',
-                'CreateQueue', 'ExecuteKernel', 'MapBuffer', 'MapImage',
-                'ReadBuffer', 'ReadImage', 'WriteBuffer', 'WriteImage'
-            ];
-            
-            if (computeBenchmarkPatterns.some(pattern => label.includes(pattern))) {
-                suite = 'Compute Benchmarks';
+        if (window.flamegraphData?.runs) {
+            // Check all runs for suite information for this benchmark
+            for (const runName in flamegraphData.runs) {
+                const runData = flamegraphData.runs[runName];
+                if (runData.suites && runData.suites[label]) {
+                    suite = runData.suites[label];
+                    break;
+                }
             }
         }
 
+        // If no suite found, this indicates a problem with the flamegraph data generation
+        if (!suite) {
+            console.error(`No suite information found for flamegraph: ${label}. This indicates missing suite data in flamegraphs.js`);
+            suite = `ERROR: Missing suite for ${label}`;
+        }
+        
         // Add to suite names
         suiteNames.add(suite);
 
         // Create a synthetic timeseries entry for this flamegraph
         const syntheticData = {
             label: label,
-            display_label: metadata?.display_name || label,
+            display_label: label, // Use label directly since this is synthetic data
             suite: suite,
             unit: 'flamegraph',
             lower_is_better: false,

devops/scripts/benchmarks/main.py

@@ -410,6 +410,15 @@ def main(directory, additional_env_vars, compare_names, filter):
                 f"Reloaded {len(history.runs)} benchmark runs for HTML generation."
             )
 
+        # Finalize flamegraph data for this run (write all benchmarks to flamegraphs.js)
+        if options.flamegraph and options.save_name:
+            try:
+                flamegraph = get_flamegraph()
+                flamegraph.finalize_run_flamegraphs(html_path, options.save_name)
+                log.info(f"Finalized flamegraph data for run: {options.save_name}")
+            except Exception as e:
+                log.debug(f"Failed to finalize flamegraph data: {e}")
+
         generate_html(history, compare_names, html_path, metadata)
         log.info(f"HTML with benchmark results has been generated")
 

devops/scripts/benchmarks/output_html.py

@@ -26,42 +26,6 @@ def _write_output_to_file(
     if options.output_html == "local":
         data_path = os.path.join(html_path, f"{filename}.js")
 
-        # Check if the file exists and has flamegraph data that we need to preserve
-        existing_flamegraph_data = None
-        if os.path.exists(data_path):
-            try:
-                with open(data_path, "r") as f:
-                    existing_content = f.read()
-                # Extract existing flamegraphData if present
-                if "flamegraphData = {" in existing_content:
-                    start = existing_content.find("flamegraphData = {")
-                    if start != -1:
-                        # Find the end of the flamegraphData object
-                        brace_count = 0
-                        found_start = False
-                        end = start
-                        for i, char in enumerate(existing_content[start:], start):
-                            if char == "{":
-                                brace_count += 1
-                                found_start = True
-                            elif char == "}" and found_start:
-                                brace_count -= 1
-                                if brace_count == 0:
-                                    end = i + 1
-                                    break
-                        if found_start and end > start:
-                            # Extract the complete flamegraphData section including the semicolon
-                            next_semicolon = existing_content.find(";", end)
-                            if next_semicolon != -1:
-                                existing_flamegraph_data = existing_content[
-                                    start : next_semicolon + 1
-                                ]
-                                log.debug(
-                                    "Preserved existing flamegraph data for HTML output"
-                                )
-            except Exception as e:
-                log.debug(f"Could not parse existing flamegraph data: {e}")
-
         with open(data_path, "w") as f:
             # For local format, we need to write JavaScript variable assignments
             f.write("benchmarkRuns = ")
@@ -80,12 +44,6 @@ def _write_output_to_file(
             json.dump(json.loads(output.to_json())["tags"], f, indent=2)
             f.write(";\n")
 
-            # Preserve and append existing flamegraph data if any
-            if existing_flamegraph_data:
-                f.write("\n")
-                f.write(existing_flamegraph_data)
-                f.write("\n")
-
             if not archive:
                 log.info(f"See {html_path}/index.html for the results.")
     else: