-
{{ __('Band total') }}
-
- {{ number_format($session->band->total_tps, 1) }}
- {{ __('tok/s') }}
-
-
- {{ number_format($session->band->total_tokens) }}
- {{ __('tokens') }}
-
-
- ✔ {{ $session->band->total_passed }}
- ✘ {{ $session->band->total_failed }}
-
+ {{-- Dual totals: Devlogic (soft/prose/psych/depthsweep) + Sysops (infra/scenario) --}}
+ @if ($session->band->devlogic_tps !== null || $session->band->sysops_tps !== null)
+
+ @if ($session->band->devlogic_tps !== null)
+
+ {{ __('Devlogic total') }}
+
+ {{ number_format($session->band->devlogic_tps, 1) }}
+ {{ __('tok/s') }}
+
+
+ {{ number_format($session->band->devlogic_tokens) }}
+ {{ __('tokens') }}
+
+
+ ✔ {{ $session->band->devlogic_passed }}
+ ✘ {{ $session->band->devlogic_failed }}
+
+
+ @endif
+ @if ($session->band->sysops_tps !== null)
+
+ {{ __('Sysops total') }}
+
+ {{ number_format($session->band->sysops_tps, 1) }}
+ {{ __('tok/s') }}
+
+
+ {{ number_format($session->band->sysops_tokens) }}
+ {{ __('tokens') }}
+
+
+ ✔ {{ $session->band->sysops_passed }}
+ ✘ {{ $session->band->sysops_failed }}
+
+
+ @endif
@endif
{{-- Column titles aligned over the suite rows (md+ only) --}}
diff --git a/tests/Feature/SessionSummaryTest.php b/tests/Feature/SessionSummaryTest.php
index 52f3126..eb3efa2 100644
--- a/tests/Feature/SessionSummaryTest.php
+++ b/tests/Feature/SessionSummaryTest.php
@@ -2,16 +2,14 @@
use App\Models\BenchmarkRun;
use App\Models\InfrabenchResult;
+use App\Models\ScenarioRun;
use App\Models\SoftbenchResult;
use App\Models\User;
use Illuminate\Support\Facades\Artisan;
-test('festbench:summary groups matching runs despite different labels', function () {
+test('festbench:summary splits runs by label into separate bands', function () {
$me = User::factory()->create(['name' => 'peterZ']);
- // All three runs share real configuration identity. Labels are user
- // notes, not grouping identity, so the different session B label must
- // not fork a second bubble.
$a = BenchmarkRun::factory()->create([
'suite' => 'softbench', 'label' => 'session A', 'model_id' => 'm', 'model_quant' => 'Q5_K_M',
'gpu' => 'AMD R9700', 'gpu_count' => 1, 'engine' => 'llama.cpp', 'user_id' => $me->id, 'visibility' => 'public',
@@ -36,24 +34,20 @@
Artisan::call('festbench:summary');
+ // Different labels → separate bands.
$bands = DB::table('session_summaries')->orderBy('sequence')->get();
- expect($bands)->toHaveCount(1);
+ expect($bands)->toHaveCount(2);
- $bandA = $bands->first();
+ $bandA = $bands->firstWhere('label', 'session A');
expect($bandA->runner_name)->toBe('peterZ')
->and($bandA->gpu)->toBe('AMD R9700')
->and($bandA->gpu_count)->toBe(1)
- // Mixed labels intentionally show no single label on the band.
- ->and($bandA->label)->toBeNull()
- ->and($bandA->total_passed)->toBe(3)
- ->and($bandA->total_failed)->toBe(1)
- ->and($bandA->total_tokens)->toBe(650);
+ ->and($bandA->label)->toBe('session A');
$rowsA = DB::table('session_suite_rows')->where('session_summary_id', $bandA->id)->orderBy('sequence')->get();
- expect($rowsA)->toHaveCount(3);
+ expect($rowsA)->toHaveCount(2);
- $soft = $rowsA->where('suite', 'softbench')->firstWhere('level', 'off');
- // simple avg of (60, 20) = 40; weighted = (60*100 + 20*300)/400 = 30
+ $soft = $rowsA->firstWhere('suite', 'softbench');
expect($soft->passed)->toBe(1)
->and($soft->failed)->toBe(1)
->and($soft->avg_user_tps)->toBe(40.0)
@@ -63,9 +57,55 @@
$infra = $rowsA->firstWhere('suite', 'infrabench');
expect($infra->passed)->toBe(1)->and($infra->level)->toBe('low');
+});
- $secondSoft = $rowsA->where('suite', 'softbench')->firstWhere('level', 'medium');
- expect($secondSoft->passed)->toBe(1)->and($secondSoft->total_tokens)->toBe(50);
+test('devlogic and sysops totals are split by suite category', function () {
+ $me = User::factory()->create();
+
+ $soft = BenchmarkRun::factory()->create([
+ 'suite' => 'softbench', 'label' => 'dual', 'model_id' => 'm', 'model_quant' => 'Q5_K_M',
+ 'gpu' => 'GPU1', 'gpu_count' => 1, 'engine' => 'llama.cpp', 'user_id' => $me->id, 'visibility' => 'public',
+ 'ran_at' => '2026-09-03 12:00:00',
+ ]);
+ SoftbenchResult::factory()->create(['benchmark_run_id' => $soft->id, 'ok' => true, 'user_tps' => 50.0, 'total' => 100, 'level' => 'off']);
+ SoftbenchResult::factory()->create(['benchmark_run_id' => $soft->id, 'ok' => false, 'user_tps' => 10.0, 'total' => 200, 'level' => 'off']);
+
+ $infra = BenchmarkRun::factory()->create([
+ 'suite' => 'infrabench', 'label' => 'dual', 'model_id' => 'm', 'model_quant' => 'Q5_K_M',
+ 'gpu' => 'GPU1', 'gpu_count' => 1, 'engine' => 'llama.cpp', 'user_id' => $me->id, 'visibility' => 'public',
+ 'ran_at' => '2026-09-03 12:05:00',
+ ]);
+ InfrabenchResult::factory()->create(['benchmark_run_id' => $infra->id, 'ok' => true, 'user_tps' => 30.0, 'total' => 150, 'level' => 'low']);
+
+ $scen = BenchmarkRun::factory()->create([
+ 'suite' => 'scenariobench', 'label' => 'dual', 'model_id' => 'm', 'model_quant' => 'Q5_K_M',
+ 'gpu' => 'GPU1', 'gpu_count' => 1, 'engine' => 'llama.cpp', 'user_id' => $me->id, 'visibility' => 'public',
+ 'ran_at' => '2026-09-03 12:10:00',
+ ]);
+ ScenarioRun::factory()->create(['benchmark_run_id' => $scen->id, 'ok' => true, 'gen_tokens' => 5000, 'wall' => 100.0]);
+ ScenarioRun::factory()->create(['benchmark_run_id' => $scen->id, 'ok' => false, 'gen_tokens' => 3000, 'wall' => 200.0]);
+
+ Artisan::call('festbench:summary');
+
+ $band = DB::table('session_summaries')->where('label', 'dual')->first();
+
+ // Devlogic: softbench only — 2 observations (50, 10).
+ // geo-mean = exp((ln(50)+ln(10))/2) = sqrt(500) ≈ 22.4
+ expect($band->devlogic_passed)->toBe(1)
+ ->and($band->devlogic_failed)->toBe(1)
+ ->and($band->devlogic_tokens)->toBe(300)
+ ->and($band->devlogic_tps)->toBe(22.4);
+
+ // Sysops: infrabench (1 obs: user_tps=30, tokens=150) +
+ // scenariobench (2 obs: gen_tokens/wall = 50.0 and 15.0, tokens=8000).
+ // Total sysops tokens = 150 + 8000 = 8150.
+ expect($band->sysops_passed)->toBe(2)
+ ->and($band->sysops_failed)->toBe(1)
+ ->and($band->sysops_tokens)->toBe(8150);
+ // sysops_tps is a geo-mean of 3 positive values — just verify it is
+ // populated and roughly in range.
+ expect($band->sysops_tps)->not->toBeNull();
+ expect($band->sysops_tps)->toBeGreaterThan(10.0)->toBeLessThan(50.0);
});
test('private runs form their own band and are hidden from guests', function () {
@@ -86,7 +126,6 @@
expect(DB::table('session_summaries')->count())->toBe(2)
->and(DB::table('session_summaries')->where('visibility', 'private')->count())->toBe(1);
- // Guest home shows the public band only; owner sees both
$this->get(route('home'))->assertOk()->assertSee('pub');
$bands = DB::table('session_summaries')->pluck('visibility');