google axion

Cyclenerd · Nov 1, 2024 · e11528a · e11528a
1 parent 45544ef
commit e11528a
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 15 deletions.
diff --git a/build/08_cpu.pl b/build/08_cpu.pl
@@ -96,6 +96,7 @@
 	   $amd   = '1' if ($update_availableCpuPlatform =~ m/amd/i );
 	my $arm   = '0';
 	   $arm   = '1' if ($update_availableCpuPlatform =~ m/ampere/i );
+	   $arm   = '1' if ($update_availableCpuPlatform =~ m/axion/i );
 	my $update = qq ~
 		UPDATE instances
 		SET

diff --git a/build/site.pl b/build/site.pl
@@ -250,6 +250,7 @@
 	(SELECT COUNT(name) FROM instances WHERE region = I.region AND availableCpuPlatform LIKE "%Milan%")        AS amdMilan,
 	(SELECT COUNT(name) FROM instances WHERE region = I.region AND availableCpuPlatform LIKE "%Genoa%")        AS amdGenoa,
 	(SELECT COUNT(name) FROM instances WHERE region = I.region AND availableCpuPlatform LIKE "%Altra%")        AS armAmpereAltra,
+	(SELECT COUNT(name) FROM instances WHERE region = I.region AND availableCpuPlatform LIKE "%Axion%")        AS armGoogleAxion,
 	(SELECT COUNT(name) FROM instances WHERE region = I.region AND family LIKE "%General%")     AS generalCount,
 	(SELECT COUNT(name) FROM instances WHERE region = I.region AND family LIKE "%Compute%")     AS computeCount,
 	(SELECT COUNT(name) FROM instances WHERE region = I.region AND family LIKE "%Memory%")      AS memoryCount,

diff --git a/build/src/arm.tt2 b/build/src/arm.tt2
@@ -6,8 +6,8 @@
 [%- countArm = 0; FOREACH instance IN instances; IF instance.arm; countArm = countArm + 1; END; END -%]
 <blockquote class="blockquote">
 <p>
-There are <mark>[% countArm %]</mark> Google Compute Engine machine types with Ampere Altra Arm-based central processing unit (CPU) available.
-Not every Google Cloud VM with Ampere Altra Arm-based CPU is available in every region.
+There are <mark>[% countArm %]</mark> Google Compute Engine machine types with Arm-based central processing unit (CPU) available.
+Not every Google Cloud VM with Arm-based CPU is available in every region.
 </p>
 </blockquote>
 

diff --git a/build/src/index.tt2 b/build/src/index.tt2
@@ -46,7 +46,10 @@ You can also find the average costs per GCE machine type across all Google Cloud
 </p>
 
 <p>
-You have the choice between <mark>[% intel %] machine types with <a href="/intel.html">Intel</a> CPU</mark>, <mark>[% amd %] CPU machine types with <a href="/amd.html">AMD</a> CPU</mark> and <mark>[% arm %] CPU machine types with <a href="/arm.html">Ampere Altra Arm-based</a> processors</mark>.
+You have the choice between
+<mark>[% intel %] machine types with <a href="/intel.html">Intel</a> CPU</mark>,
+<mark>[% amd %] CPU machine types with <a href="/amd.html">AMD</a> CPU</mark> and
+<mark>[% arm %] CPU machine types with <a href="/arm.html">Arm-based</a> processors</mark>.
 [% sap %] machine types are certified for <a href="/sap.html">SAP application</a> and [% hana %] machine types are certified for <a href="/hana.html">SAP HANA</a> on Google Cloud.
 </p>
 
@@ -205,6 +208,7 @@ Use the arrow keys (<kbd>←</kbd> <kbd>↑</kbd> <kbd>→</kbd> <kbd>↓</kbd>)
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c3_series" rel="nofollow">C3</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c3d_series" rel="nofollow">C3D</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c4_series" rel="nofollow">C4</a>,
+				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c4a_series" rel="nofollow">C4A</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#e2_machine_types" rel="nofollow">E2</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#n1_machines" rel="nofollow">N1</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#n2_series" rel="nofollow">N2</a>,

diff --git a/build/src/instances_header.tt2 b/build/src/instances_header.tt2
@@ -11,7 +11,7 @@
 		<a [% IF template.name == 'amd.tt2' %]class="nav-link active" aria-current="page"[% ELSE %]class="nav-link"[% END %] href="/amd.html">AMD</a>
 	</li>
 	<li class="nav-item">
-		<a [% IF template.name == 'arm.tt2' %]class="nav-link active" aria-current="page"[% ELSE %]class="nav-link"[% END %] href="/arm.html">Arm (Ampere)</a>
+		<a [% IF template.name == 'arm.tt2' %]class="nav-link active" aria-current="page"[% ELSE %]class="nav-link"[% END %] href="/arm.html">Arm</a>
 	</li>
 	<li class="nav-item">
 		<a [% IF template.name == 'gpu.tt2' %]class="nav-link active" aria-current="page"[% ELSE %]class="nav-link"[% END %] href="/gpu.html">GPU</a>

diff --git a/build/src/main.js b/build/src/main.js
@@ -239,7 +239,7 @@ const gridOptions = {
 					columnGroupShow: 'open',
 					filterParams: filterParamsBoolean,
 					valueFormatter: booleanFormatter,
-					headerTooltip: 'Ampere Altra Arm-based CPU processors (1, 0)',
+					headerTooltip: 'Arm-based CPU processors (1, 0)',
 					width: 90
 				},
 				{

diff --git a/build/src/platforms.tt2 b/build/src/platforms.tt2
@@ -8,7 +8,7 @@
 You have the choice between Google Compute Engine machine types with
 <a href="/intel.html">Intel</a>,
 <a href="/amd.html">AMD</a>, or
-<a href="/arm.html">Ampere Altra Arm-based</a>
+<a href="/arm.html">Arm-based</a>
 central processing units (CPUs).
 The different CPU platforms differ from the year of release and performance.
 Not every CPU is available in all Google Cloud region and zones.
@@ -36,7 +36,7 @@ Not every CPU is available in all Google Cloud region and zones.
 		<th scope="col">Zones</th>
 		<th scope="col" colspan="6">Intel</th>
 		<th scope="col" colspan="3">AMD</th>
-		<th scope="col" colspan="1">Arm</th>
+		<th scope="col" colspan="2">Arm (Ampere, Google)</th>
 	</tr>
 	<tr>
 		<th scope="col" data-field="name" data-sortable="true">Name</th>
@@ -52,8 +52,8 @@ Not every CPU is available in all Google Cloud region and zones.
 		<th scope="col" data-sortable="true" title="AMD EPYC Genoa 4rd Generation">Genoa</th>
 		<th scope="col" data-sortable="true" title="AMD EPYC Milan 3rd Generation">Milan</th>
 		<th scope="col" data-sortable="true" title="AMD EPYC Rome 2nd Generation">Rome</th>
-		<th scope="col" data-sortable="true" title="Ampere Altra">Ampere Altra</th>
-
+		<th scope="col" data-sortable="true" title="Ampere Altra">Altra</th>
+		<th scope="col" data-sortable="true" title="Google Axion">Axion</th>
 	</tr>
 </thead>
 <tbody>
@@ -83,6 +83,7 @@ Not every CPU is available in all Google Cloud region and zones.
 		[% IF region.amdMilan            %]<td>[% region.amdMilan            %]</td>[% ELSE %]<td class="text-muted">0</td>[% END %]
 		[% IF region.amdRome             %]<td>[% region.amdRome             %]</td>[% ELSE %]<td class="text-muted">0</td>[% END %]
 		[% IF region.armAmpereAltra      %]<td>[% region.armAmpereAltra      %]</td>[% ELSE %]<td class="text-muted">0</td>[% END %]
+		[% IF region.armGoogleAxion      %]<td>[% region.armGoogleAxion      %]</td>[% ELSE %]<td class="text-muted">0</td>[% END %]
 	</tr>
 	[% END %]
 </tbody>

diff --git a/instances/README.md b/instances/README.md
@@ -15,8 +15,9 @@ The SQL files are read during the [build](../build/) process.
 	* [C2](./series/c2.sql)
 	* [C2D](./series/c2d.sql)
 	* [C3](./series/c3.sql)
-        * [C3D](./series/c3d.sql)
-        * [C4](./series/c4.sql)
+	* [C3D](./series/c3d.sql)
+	* [C4](./series/c4.sql)
+	* [C4A](./series/c4a.sql)
 	* [E2](./series/e2.sql)
 	* [G2](./series/g2.sql)
 	* [M1](./series/m1.sql)
@@ -64,6 +65,7 @@ The cost per machine type in region and licenses are added with the [gcosts](htt
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c3_series" rel="nofollow">C3</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c3d_series" rel="nofollow">C3D</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c4_series" rel="nofollow">C4</a>,
+				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#c4a_series" rel="nofollow">C4A</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#e2_machine_types" rel="nofollow">E2</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#n1_machines" rel="nofollow">N1</a>,
 				<a href="https://cloud.google.com/compute/docs/general-purpose-machines#n2_machines" rel="nofollow">N2</a>,

diff --git a/instances/clean_up.sql b/instances/clean_up.sql
@@ -8,6 +8,7 @@ DELETE FROM machinetypes WHERE name LIKE 'ct4p-%';
 DELETE FROM machinetypes WHERE name LIKE 'ct5l-%';
 DELETE FROM machinetypes WHERE name LIKE 'ct5lp-%';
 DELETE FROM machinetypes WHERE name LIKE 'ct5p-%';
+DELETE FROM machinetypes WHERE name LIKE 'ct6e-%';
 
 DELETE FROM machinetypes WHERE name LIKE 'x4-%';
 

diff --git a/instances/series/c4a.sql b/instances/series/c4a.sql
@@ -0,0 +1,24 @@
+/* C4A General-purpose */
+/* https://cloud.google.com/compute/docs/general-purpose-machines#c4a_series */
+UPDATE instances SET
+series      = 'c4a',
+family      = 'General-purpose',
+cpuPlatform = 'Google Axion',
+localSsd    = '0',
+sud         = '0',
+spot        = '1'
+WHERE name LIKE 'c4a-%';
+UPDATE instances SET bandwidth = '10' WHERE name LIKE 'c4a-%-1';
+UPDATE instances SET bandwidth = '10' WHERE name LIKE 'c4a-%-2';
+UPDATE instances SET bandwidth = '23' WHERE name LIKE 'c4a-%-4';
+UPDATE instances SET bandwidth = '23' WHERE name LIKE 'c4a-%-8';
+UPDATE instances SET bandwidth = '23' WHERE name LIKE 'c4a-%-16';
+UPDATE instances SET bandwidth = '23' WHERE name LIKE 'c4a-%-32';
+UPDATE instances SET bandwidth = '34' WHERE name LIKE 'c4a-%-48';
+UPDATE instances SET bandwidth = '45' WHERE name LIKE 'c4a-%-64';
+UPDATE instances SET bandwidth = '50' WHERE name LIKE 'c4a-%-72';
+
+UPDATE instances SET tier1 = '50'  WHERE name LIKE 'c4a-%-32%';
+UPDATE instances SET tier1 = '50'  WHERE name LIKE 'c4a-%-48%';
+UPDATE instances SET tier1 = '75'  WHERE name LIKE 'c4a-%-64%';
+UPDATE instances SET tier1 = '100' WHERE name LIKE 'c4a-%-72%';
diff --git a/instances/series/cpu/frequency.sql b/instances/series/cpu/frequency.sql
@@ -1,5 +1,5 @@
 /* Intel */
-/* https://cloud.google.com/compute/docs/cpu-platforms#intel_cpu_processors */
+/* https://cloud.google.com/compute/docs/cpu-platforms#intel_processors */
 
 /* Intel Xeon E5 (Sandy Bridge) */
 UPDATE instances SET cpuBaseClock  = '2.6', cpuTurboClock  = '3.2', cpuSingleMaxTurboClock = '3.6' WHERE availableCpuPlatform LIKE "%Sandy%" AND series LIKE "n1";
@@ -45,7 +45,7 @@ UPDATE instances SET cpuBaseClock  = '2.1', cpuTurboClock  = '2.9', cpuSingleMax
 UPDATE instances SET cpuBaseClock  = '2.3', cpuTurboClock  = '3.1', cpuSingleMaxTurboClock = '4.0' WHERE availableCpuPlatform LIKE "%Emerald Rapids%" AND series LIKE "c4";
 
 /* AMD */
-/* https://cloud.google.com/compute/docs/cpu-platforms#amd_cpu_processors */
+/* https://cloud.google.com/compute/docs/cpu-platforms#amd_processors */
 
 /* AMD EPYC Rome 2nd Generation */
 UPDATE instances SET cpuBaseClock  = '2.25', cpuTurboClock  = '2.7', cpuSingleMaxTurboClock = '3.3' WHERE availableCpuPlatform LIKE "%Rome%";
@@ -58,7 +58,12 @@ UPDATE instances SET cpuBaseClock  = '2.6', cpuTurboClock  = '3.45', cpuSingleMa
 
 
 /* Arm */
+/* https://cloud.google.com/compute/docs/cpu-platforms#arm_processors */
 
-/* Ampere Altra */
-/* https://cloud.google.com/compute/docs/cpu-platforms#amd_cpu_processors */
+/* Ampere Altra Q64-30 */
+/* https://amperecomputing.com/briefs/ampere-altra-family-product-brief */
 UPDATE instances SET cpuBaseClock = '3.0', cpuTurboClock = '3.0', cpuSingleMaxTurboClock = '3.0' WHERE availableCpuPlatform LIKE "%Ampere Altra%";
+
+/* Google Axion Processors */
+/* https://gist.github.com/Cyclenerd/57ffee632dcb3d7e537fbcdc9779cb50 */
+UPDATE instances SET cpuBaseClock = '3.0', cpuTurboClock = '3.0', cpuSingleMaxTurboClock = '3.0' WHERE availableCpuPlatform LIKE "%Google Axion%";