revert

Earthfile

@@ -26,9 +26,5 @@ build:
 test-end-to-end:
     BUILD ./yarn-project/end-to-end/+test-all
 
-echo-github-ref:
-    ARG EARTHLY_GIT_HASH
-    RUN echo $EARTHLY_GIT_HASH
-
 bench:
   RUN echo hi

yarn-project/Earthfile

@@ -55,7 +55,7 @@ aztec:
     # 62368   @types
 
 source:
-    # for debugging rebuild
+    # for debugging rebuilds
     RUN echo CONTENT HASH $(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}') | tee .content-hash
 
 end-to-end:

yarn-project/circuit-types/src/stats/metrics.ts

@@ -8,8 +8,7 @@ export type MetricGroupBy =
   | 'classes-registered'
   | 'leaf-count'
   | 'data-writes'
-  | 'fee-payment-method'
-  | 'circuit-size-in-gates';
+  | 'fee-payment-method';
 
 /** Definition of a metric to track in benchmarks. */
 export interface Metric {
@@ -25,18 +24,6 @@ export interface Metric {
 
 /** Metric definitions to track from benchmarks. */
 export const Metrics = [
-  {
-    name: 'client_ivc_proving_time_in_ms',
-    groupBy: 'circuit-size-in-gates',
-    description: 'Proving time for ClientIVC grouped by circuit size.',
-    events: [],
-  },
-  {
-    name: 'ultrahonk_proving_time_in_ms',
-    groupBy: 'circuit-size-in-gates',
-    description: 'Proving time for UltraHonk grouped by circuit size.',
-    events: [],
-  },
   {
     name: 'l1_rollup_calldata_size_in_bytes',
     groupBy: 'block-size',

yarn-project/scripts/src/benchmarks/aggregate.ts

@@ -228,15 +228,6 @@ function processEntry(entry: Stats, results: BenchmarkCollectedResults, fileName
   }
 }
 
-function getBarretenbergMetric(context: { executable?: string }): MetricName | undefined {
-  if (context.executable?.includes('ultra_honk')) {
-    return 'ultrahonk_proving_time_in_ms';
-  } else if (context.executable?.includes('client_ivc')) {
-    return 'client_ivc_proving_time_in_ms';
-  }
-  return undefined;
-}
-
 /** Array of collected raw results for a given metric. */
 type BenchmarkCollectedMetricResults = Record<string, number[]>;
 
@@ -278,28 +269,6 @@ export async function main() {
     }
   }
 
-  // Add google benchmark json files, which have data already averaged
-  const googleBenchmarkFiles = fs.readdirSync(LogsDir).filter(f => f.endsWith('.json'));
-  for (const file of googleBenchmarkFiles) {
-    const data = JSON.parse(fs.readFileSync(path.join(LogsDir, file), 'utf-8'));
-    if (!data.context || !data.benchmarks) {
-      log(`Invalid google benchmark file: ${file}`);
-      continue;
-    }
-    const metric = getBarretenbergMetric(data.context);
-    if (!metric) {
-      log(`Unknown executable in benchmark file ${file}: ${data.context.executable}`);
-      continue;
-    }
-    const circuitSize = '2^20'; // Where to load size from?
-    const value = data.benchmarks[0]?.real_time;
-    if (value === undefined) {
-      log(`Couldn't find real_time in benchmark file ${file}`);
-      continue;
-    }
-    results[metric] = { [circuitSize]: value };
-  }
-
   const timestampedResults: BenchmarkResultsWithTimestamp = { ...results, timestamp: new Date().toISOString() };
 
   // Write results to disk

yarn-project/scripts/src/benchmarks/markdown.ts

@@ -189,7 +189,6 @@ export function getMarkdown() {
   const metricsByClassesRegistered = Metrics.filter(m => m.groupBy === 'classes-registered').map(m => m.name);
   const metricsByFeePaymentMethod = Metrics.filter(m => m.groupBy === 'fee-payment-method').map(m => m.name);
   const metricsByLeafCount = Metrics.filter(m => m.groupBy === 'leaf-count').map(m => m.name);
-  const metricsByCircuitSize = Metrics.filter(m => m.groupBy === 'circuit-size-in-gates').map(m => m.name);
 
   const metricsTxPxeProcessing = Metrics.filter(m => m.name === 'tx_pxe_processing_time_ms').map(m => m.name);
   const metricsTxSeqProcessing = Metrics.filter(m => m.name === 'tx_sequencer_processing_time_ms').map(m => m.name);
@@ -215,15 +214,10 @@ ${getWarningsSummary(benchmark, baseBenchmark)}
 
 <summary>Detailed results</summary>
 
-Except for proving times, all benchmarks are run on txs on the \`Benchmarking\` contract on the repository. Each tx consists of a batch call  to \`create_note\` and \`increment_balance\`, which guarantees that each tx has a private call, a nested private call, a public call, and a nested public call, as well as an emitted private note, an unencrypted log, and public storage read and write.
+All benchmarks are run on txs on the \`Benchmarking\` contract on the repository. Each tx consists of a batch call  to \`create_note\` and \`increment_balance\`, which guarantees that each tx has a private call, a nested private call, a public call, and a nested public call, as well as an emitted private note, an unencrypted log, and public storage read and write.
 ${prSourceDataText}
 ${baseCommitText}
 
-### Proving times
-
-Average proving times for benchmarks measured in bb.
-${getTableContent(pick(benchmark, metricsByCircuitSize), baseBenchmark, 'gates', 'Circuit')}
-
 ### L2 block published to L1
 
 Each column represents the number of txs on an L2 block published to L1.