JBR-7391 update JBR configurations

JetBrains · Nov 26, 2024 · bea63a0 · bea63a0
1 parent 13180a8
commit bea63a0
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 45 deletions.
diff --git a/cmd/tc-collector/main.go b/cmd/tc-collector/main.go
@@ -102,8 +102,13 @@ func configureCollectFromTeamCity() error {
 			}
 		case chunk.Database == "jbr":
 			jbrTypes := []string{
-				"MacOS12aarch64Metal", "MacOS12aarch64OGL", "MacOS12x86_64Metal", "MacOS12x86_64OGL", "MacOS13aarch64Metal", "MacOS13aarch64OGL", "MacOS13x86_64Metal",
-				"MacOS13x86_64OGL", "Ubuntu2004x86_64", "Ubuntu2004x86_64OGL", "Ubuntu2204x86_64", "Ubuntu2204x86_64OGL", "Windows10x86_64", "Windows11x86_64",
+				"macOS13aarch64", "macOS13aarch64Metal", "macOS13aarch64OGL",
+				"macOS13x86_64", "macOS13x86_64Metal", "macOS13x86_64OGL",
+				"macOS14x86_64", "macOS14x86_64Metal", "macOS14x86_64OGL",
+				"macOS15aarch64mini", "macOS15aarch64miniMetal", "macOS15aarch64miniOGL",
+				"macOS15x86_64mini", "macOS15x86_64miniMetal", "macOS15x86_64miniOGL",
+				"Ubuntu2004x86_64", "Ubuntu2004x86_64OGL",
+				"Windows10x86_64",
 			}
 			for _, configuration := range chunk.Configurations {
 				for _, jbrType := range jbrTypes {

diff --git a/dashboard/new-dashboard/src/components/jbr/DaCapoDashboard.vue b/dashboard/new-dashboard/src/components/jbr/DaCapoDashboard.vue
@@ -48,7 +48,26 @@ import GroupProjectsChart from "../charts/GroupProjectsChart.vue"
 import DashboardPage from "../common/DashboardPage.vue"
 import { jbrLinuxConfigurations, jbrMacConfigurations, jbrWindowsConfigurations } from "./configurations"
 
-const metricsNames = ["avrora", "fop", "h2", "jython", "luindex", "lusearch", "pmd", "sunflow", "xalan"]
+const metricsNames = [
+  "avrora",
+  "batik",
+  "biojava",
+  "eclipse",
+  "fop",
+  "graphchi",
+  "h2",
+  "jme",
+  "jython",
+  "kafka",
+  "luindex",
+  "lusearch",
+  "pmd",
+  "spring",
+  "sunflow",
+  "tomcat",
+  "xalan",
+  "zxing",
+]
 const ubuntuConfigurations = jbrLinuxConfigurations.map((config) => "DaCapo_" + config)
 const macOSConfigurations = jbrMacConfigurations.map((config) => "DaCapo_" + config)
 const windowsConfigurations = jbrWindowsConfigurations.map((config) => "DaCapo_" + config)

diff --git a/dashboard/new-dashboard/src/components/jbr/J2DBenchDashboard.vue b/dashboard/new-dashboard/src/components/jbr/J2DBenchDashboard.vue
@@ -48,16 +48,7 @@ import GroupProjectsChart from "../charts/GroupProjectsChart.vue"
 import DashboardPage from "../common/DashboardPage.vue"
 import { jbrLinuxConfigurations, jbrMacConfigurations, jbrWindowsConfigurations } from "./configurations"
 
-const metricsNames = [
-  "graphics.imaging.benchmarks.tests.drawimage",
-  "graphics.imaging.benchmarks.tests.drawimagescaleup",
-  "graphics.imaging.benchmarks.tests.drawimagetxform",
-  "graphics.render.tests.drawLine",
-  "graphics.render.tests.fillOval",
-  "graphics.render.tests.fillRect",
-  "graphics.render.tests.shape.fillCubic",
-  "text.Rendering.tests.drawString",
-]
+const metricsNames = ["poly250", "poly250-rand_col", "poly250-AA-rand_col"]
 const ubuntuConfigurations = jbrLinuxConfigurations.map((config) => "J2DBench_" + config)
 const macOSConfigurations = jbrMacConfigurations.map((config) => "J2DBench_" + config)
 const windowsConfigurations = jbrWindowsConfigurations.map((config) => "J2DBench_" + config)

diff --git a/dashboard/new-dashboard/src/components/jbr/JavaDrawDashboard.vue b/dashboard/new-dashboard/src/components/jbr/JavaDrawDashboard.vue
@@ -48,7 +48,14 @@ import GroupProjectsChart from "../charts/GroupProjectsChart.vue"
 import DashboardPage from "../common/DashboardPage.vue"
 import { jbrLinuxConfigurations, jbrMacConfigurations, jbrWindowsConfigurations } from "./configurations"
 
-const metricsNames = ["Plus_200_Random_Small_Circles", "Plus_2_SweepGradient_Circles", "Plus_320_Long_Lines", "Plus_4000_Random_Small_Circles"]
+const metricsNames = [
+  "Display_PNG_Bitmap_Twice_Pass_1",
+  "Display_PNG_Bitmap_Twice_Pass_2",
+  "Plus_2_SweepGradient_Circles",
+  "Plus_200_Random_Small_Circles",
+  "Plus_320_Long_Lines",
+  "Plus_4000_Random_Small_Circles",
+]
 const ubuntuConfigurations = jbrLinuxConfigurations.map((config) => "JavaDraw_" + config)
 const macOSConfigurations = jbrMacConfigurations.map((config) => "JavaDraw_" + config)
 const windowsConfigurations = jbrWindowsConfigurations.map((config) => "JavaDraw_" + config)

diff --git a/dashboard/new-dashboard/src/components/jbr/MapBenchDashboard.vue b/dashboard/new-dashboard/src/components/jbr/MapBenchDashboard.vue
@@ -52,18 +52,18 @@ const metricsNames = [
   "CircleTests",
   "EllipseTests-fill-false",
   "EllipseTests-fill-true",
-  "spiralTest-dash-false",
-  "spiralTest-fill",
   "dc_boulder_2013-13-30-06-13-17",
   "dc_boulder_2013-13-30-06-13-20",
   "dc_shp_alllayers_2013-00-30-07-00-43",
   "dc_shp_alllayers_2013-00-30-07-00-47",
   "dc_spearfish_2013-11-30-06-11-15",
   "dc_spearfish_2013-11-30-06-11-19",
+  "dc_topp:states_2013-11-30-06-11-06",
+  "dc_topp:states_2013-11-30-06-11-07",
+  "spiralTest-dash-false",
+  "spiralTest-fill",
   "test_z_625k",
-].flatMap((test) => {
-  return ["ser.Pct95"].map((stat) => test + "." + stat)
-})
+]
 const ubuntuConfigurations = jbrLinuxConfigurations.map((config) => "Mapbench_" + config)
 const macOSConfigurations = jbrMacConfigurations.map((config) => "Mapbench_" + config)
 const windowsConfigurations = jbrWindowsConfigurations.map((config) => "Mapbench_" + config)

diff --git a/dashboard/new-dashboard/src/components/jbr/RenderDashboard.vue b/dashboard/new-dashboard/src/components/jbr/RenderDashboard.vue
@@ -99,6 +99,9 @@ const metricsNames = [
   "TextNoAA_XOR",
   "FlatQuadAA",
   "TextLCD_XOR",
+  "TextWiredQuadMix",
+  "VolImageFlatBoxMix",
+  "VolImageTextNoAABat",
 ]
 const ubuntuConfigurations = jbrLinuxConfigurations.map((config) => "Render_" + config)
 const macOSConfigurations = jbrMacConfigurations.map((config) => "Render_" + config)

diff --git a/dashboard/new-dashboard/src/components/jbr/SwingMark.vue b/dashboard/new-dashboard/src/components/jbr/SwingMark.vue
@@ -0,0 +1,55 @@
+<template>
+  <DashboardPage
+    db-name="jbr"
+    table="report"
+    persistent-id="jbr_team_dashboard"
+    :with-installer="false"
+    :is-build-number-exists="true"
+  >
+    <div
+      v-for="metric in metricsNames"
+      :key="metric"
+    >
+      <div class="relative flex py-5 items-center">
+        <div class="flex-grow border-t" />
+        <span class="flex-shrink mx-4 text-lg">{{ metric }}</span>
+        <div class="flex-grow border-t" />
+      </div>
+      <section>
+        <GroupProjectsChart
+          label="macOS"
+          :measure="metric"
+          :projects="macOSConfigurations"
+        />
+      </section>
+      <section class="flex gap-x-6">
+        <div class="flex-1 min-w-0">
+          <GroupProjectsChart
+            label="Ubuntu"
+            :measure="metric"
+            :projects="ubuntuConfigurations"
+          />
+        </div>
+        <div class="flex-1 min-w-0">
+          <GroupProjectsChart
+            label="Windows"
+            :measure="metric"
+            :projects="windowsConfigurations"
+          />
+        </div>
+      </section>
+    </div>
+  </DashboardPage>
+  >
+</template>
+
+<script setup lang="ts">
+import GroupProjectsChart from "../charts/GroupProjectsChart.vue"
+import DashboardPage from "../common/DashboardPage.vue"
+import { jbrLinuxConfigurations, jbrMacConfigurations, jbrWindowsConfigurations } from "./configurations"
+
+const metricsNames = ["Default"]
+const ubuntuConfigurations = jbrLinuxConfigurations.map((config) => "SwingMark_" + config)
+const macOSConfigurations = jbrMacConfigurations.map((config) => "SwingMark_" + config)
+const windowsConfigurations = jbrWindowsConfigurations.map((config) => "SwingMark_" + config)
+</script>
diff --git a/dashboard/new-dashboard/src/components/jbr/configurations.ts b/dashboard/new-dashboard/src/components/jbr/configurations.ts
@@ -1,31 +1,23 @@
-export const jbrWindowsConfigurations = ["Windows10x64", "Windows11x64", "Windows10x86_64", "Windows11x86_64"]
+export const jbrWindowsConfigurations = ["Windows10x86_64"]
+
 export const jbrMacConfigurations = [
-  "macOS13x64OGL",
-  "macOS13x64Metal",
-  "macOS13aarch64OGL",
+  "macOS13aarch64",
   "macOS13aarch64Metal",
-  "macOS12x64OGL",
-  "macOS12x64Metal",
-  "macOS12aarch64OGL",
-  "macOS12aarch64Metal",
+  "macOS13aarch64OGL",
+  "macOS13x86_64",
+  "macOS13x86_64Metal",
+  "macOS13x86_64OGL",
 
-  "MacOS13x86_64OGL",
-  "MacOS13x86_64Metal",
-  "MacOS13aarch64OGL",
-  "MacOS13aarch64Metal",
-  "MacOS12x86_64OGL",
-  "MacOS12x86_64Metal",
-  "MacOS12aarch64OGL",
-  "MacOS12aarch64Metal",
-]
+  "macOS14x86_64",
+  "macOS14x86_64Metal",
+  "macOS14x86_64OGL",
 
-export const jbrLinuxConfigurations = [
-  "Ubuntu2004x64",
-  "Ubuntu2004x64OGL",
-  "Ubuntu2204x64",
-  "Ubuntu2204x64OGL",
-  "Ubuntu2004x86_64",
-  "Ubuntu2004x86_64OGL",
-  "Ubuntu2204x86_64",
-  "Ubuntu2204x86_64OGL",
+  "macOS15aarch64mini",
+  "macOS15aarch64miniMetal",
+  "macOS15aarch64miniOGL",
+  "macOS15x86_64mini",
+  "macOS15x86_64miniMetal",
+  "macOS15x86_64miniOGL",
 ]
+
+export const jbrLinuxConfigurations = ["Ubuntu2004x86_64", "Ubuntu2004x86_64OGL"]