Gpu data

Makefile

@@ -1,6 +1,6 @@
 PATH       := ./node_modules/.bin:${PATH}
 # to dl, this followed by output file followed by url
-curl       := curl --retry 5 --retry-delay 5 --connect-timeout 30 -fo
+curl       := curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:131.0) Gecko/20100101 Firefox/131.0" --retry 5 --retry-delay 5 --connect-timeout 30 -fo
 node       := node ${NODE_OPTS}
 
 tests      := ./tests/*.js
@@ -35,24 +35,26 @@ athr_folder:= ./specs
 
 map_output := ./public/sitemap.txt
 
-intc_procs := ./tmp/intel-scrape.json
-intc_codes := ./tmp/intel-scrape-codenames.json
-intc_scrape:= ${intc_procs} ${intc_codes}
-intc_parse := ./tmp/intel-parse.json
-
-ubch_cpus  := ./tmp/userbenchmark-scrape-cpus.csv
-ubch_gpus  := ./tmp/userbenchmark-scrape-gpus.csv
+ubch_cpus  := ./tmp/scrape/userbenchmark-scrape-cpus.csv
+ubch_gpus  := ./tmp/scrape/userbenchmark-scrape-gpus.csv
 ubch_scrape:= ${ubch_cpus} ${ubch_gpus}
 ubch_parse := ./tmp/userbenchmark-parse.json
 
-3dmk_cpus  := ./tmp/3dmark-scrape-cpus.html
-3dmk_gpus  := ./tmp/3dmark-scrape-gpus.html
+3dmk_cpus  := ./tmp/scrape/3dmark-scrape-cpus.html
+3dmk_gpus  := ./tmp/scrape/3dmark-scrape-gpus.html
 3dmk_scrape:= ${3dmk_cpus} ${3dmk_gpus}
 3dmk_parse := ./tmp/3dmark-parse.json
 
-gbch_scrape:= ./tmp/geekbench-scrape.html
+gbch_cpus := ./tmp/scrape/geekmench-scrape-cpus.csv
+gbch_gpus_opencl := ./tmp/scrape/geekmench-scrape-gpus-opencl.csv
+gbch_gpus_vulkan := ./tmp/scrape/geekbench-scrape-gpus-vulkan.csv
+gbch_scrape:= ${gbch_cpus} ${gbch_gpus_opencl} ${gbch_gpus_vulkan}
 gbch_parse := ./tmp/geekbench-parse.json
 
+psmk_gpus := ./tmp/scrape/pass-mark-scrape-gpus.html
+psmk_scrape := ${psmk_gpus}
+psmk_parse := ./tmp/pass-mark-parse.json
+
 prod       := false
 
 development: ${n_sentinel} ${dev_guard} ${css_output} ${js_output}
@@ -82,20 +84,13 @@ ${sw_output} : ${sw_m_input}
 		${sw_output} 2>/dev/null
 
 ${spec_output} ${map_output} : ${athr_output} ${intc_parse} ${ubch_parse} ${3dmk_parse} \
-	${gbch_parse} build/combine-specs.js build/combine-util.js build/util.js
+	${gbch_parse} ${psmk_parse} build/combine-specs.js build/combine-util.js build/util.js
 	${node} build/combine-specs.js ${spec_output} ${map_output} \
-		${athr_output} ${ubch_parse} ${3dmk_parse} ${gbch_parse} ${intc_parse}
+		${athr_output} ${ubch_parse} ${3dmk_parse} ${gbch_parse} ${psmk_parse} ${intc_parse}
 
 ${athr_output} : ${athr_input} build/gen-specs.js
 	${node} build/gen-specs.js ${athr_folder} ${athr_output}
 
-${intc_scrape} :
-	${curl} ${intc_procs} 'https://markasoftware.com/specdb-intel/intel-scrape.json'
-	${curl} ${intc_codes} 'https://markasoftware.com/specdb-intel/intel-scrape-codenames.json'
-
-${intc_parse} : build/intel-parse.js build/intel-config.js ${intc_scrape}
-	${node} build/intel-parse.js ${intc_scrape} ${intc_parse}
-
 ${ubch_scrape} :
 	${curl} ${ubch_cpus} 'http://www.userbenchmark.com/resources/download/csv/CPU_UserBenchmarks.csv'
 	${curl} ${ubch_gpus} 'http://www.userbenchmark.com/resources/download/csv/GPU_UserBenchmarks.csv'
@@ -111,26 +106,38 @@ ${3dmk_parse} : ${3dmk_scrape} build/3dmark-parse.js
 	${node} build/3dmark-parse.js ${3dmk_scrape} ${3dmk_parse}
 
 ${gbch_scrape} :
-	${curl} ${gbch_scrape} 'https://browser.geekbench.com/processor-benchmarks'
+	@echo "Downloading Geekbench data..."
+	${curl} ${gbch_cpus} 'https://browser.geekbench.com/processor-benchmarks'
+	${curl} ${gbch_gpus_opencl} 'https://browser.geekbench.com/opencl-benchmarks'
+	${curl} ${gbch_gpus_vulkan} 'https://browser.geekbench.com/vulkan-benchmarks'
+	@echo "Geekbench data downloaded."
 
 # MAYBE: an implicit rule for -parse.json
 ${gbch_parse} : ${gbch_scrape} build/geekbench-parse.js
 	${node} build/geekbench-parse.js ${gbch_scrape} ${gbch_parse}
 
+${psmk_scrape} :
+	@echo "Downloading PassMark GPU data..."
+	${curl} ${psmk_gpus} 'https://www.videocardbenchmark.net/high_end_gpus.html'
+	@echo "PassMark GPU data download complete."
+
+${psmk_parse} : ${psmk_scrape} build/passmark-parse.js
+	${node} build/passmark-parse.js ${psmk_scrape} ${psmk_parse}
+
 ${n_sentinel} : package.json
 	npm install
 	touch ${n_sentinel}
 
 # clean everything
 clean:
 	${MAKE} clean-nonet
-	rm -f ${n_sentinel} ${intc_scrape} ${3dmk_scrape} ${ubch_scrape} ${gbch_scrape}
+	rm -f ${n_sentinel} ${intc_scrape} ${3dmk_scrape} ${ubch_scrape} ${gbch_scrape} ${psmk_scrape}
 
 # only clean things that can be regenerated without a network connection
 clean-nonet:
 	rm -f ${css_output} ${js_output} ${sw_output} \
 		${spec_output} ${map_output} ${intc_parse} \
 		${ubch_parse} ${3dmk_parse} ${gbch_parse} \
-		${athr_output}
+		${psmk_parse} ${athr_output}
 
 .PHONY: development production test clean clean-nonet watch

README.md

@@ -43,4 +43,4 @@ To contribute, please make a fork, and in your fork branch off from master to so
 
 ![BrowserStack logo](https://www.browserstack.com/images/layout/browserstack-logo-600x315.png)
 
-Browserstack won't let me get their open-source plan without including their logo here. I can tell they really love open source and aren't just trying to get free advertising. Especially since the Browserstack backend/whatever is used to do real-device testing remotely isn't open source. But whatever, they're the only ones who provide decent real-device testing so I guess I have to use them because I don't want to buy Apple shit.
+Browserstack won't let me get their open-source plan without including their logo here. I can tell they really love open source and aren't just trying to get free advertising. Especially since the Browserstack backend/whatever is used to do real-device testing remotely isn't open source. But whatever, they're the only ones who provide decent real-device testing so I guess I have to use them because I don't want to buy Apple shit.

build/3dmark-parse.js

@@ -13,19 +13,35 @@ const parse = (path, partType, benchmarkType) => {
 		}).get();
 	// c => c.score sometimes gets rid of new GPUs which are listed, but
 	// whose score is displayed as "0" (this is good)
-	const niceData = rawData.filter(c => c.score).map(c => ({
-		combineMetadata: {
-			matcherInfo: {
-				name: c.name,
-				type: partType,
-				source: '3dmark',
+	if(partType == "gpu"){
+		const niceData = rawData.filter(c => c.score).map(c => ({
+			combineMetadata: {
+				matcherInfo: {
+					name: c.name,
+					type: partType,
+					source: '3dmark',
+				},
 			},
-		},
-		data: {
-			[`3DMark Fire Strike ${benchmarkType} Score`]: c.score,
-		},
-	}));
-	return niceData;
+			data: {
+				[`3DMark ${benchmarkType} Score`]: c.score,
+			},
+		}));
+		return niceData;
+	}else {
+		const niceData = rawData.filter(c => c.score).map(c => ({
+			combineMetadata: {
+				matcherInfo: {
+					name: c.name,
+					type: partType,
+					source: '3dmark',
+				},
+			},
+			data: {
+				[`3DMark Fire Strike ${benchmarkType} Score`]: c.score,
+			},
+		}));
+		return niceData;
+	}
 }
 
 const [cpuPath, gpuPath, outPath] = process.argv.slice(2);

build/combine-util.js

@@ -85,23 +85,76 @@ const combineUtil = {
 			hints.type = hints.type.toLowerCase();
 		}
 
+
+
 		const series = [
+			// Intel Arc
+			{
+				nameTest: /^(\(R\).)?Arc(\(TM\))?.A[0-9]{3}(.Graphics)?$/i,
+				brand: 'intel',
+				type: 'gpu',
+				parser: () => {
+					return hints.cleanName.replace('(R)-','').replace('(TM)','').replace('-Graphics','');
+				},
+				// Intel(R) Arc(TM) A770 Graphics
+			},
 			// RX
 			{
-				nameTest: /^R[579X]-\d\d\d(?!.*[Ll]aptop)/,
+				nameTest: /(\(TM\)-)?(Pro.)?RX-(\(TM\)-)?\d{3,4}(?!.*[Ll]aptop)(.XT)?(.XTX)?$/i,
 				brand: 'amd',
 				type: 'gpu',
 				parser: () => {
-					// TODO: how do we give data with GB specified higher priority than data w/o?
-					const regexMatch = hints.cleanName.match(/(R[579X]-\d\d\dX?)(-(\d+)GB)?/);
-					if (regexMatch) {
-						const [ , rxXxx, , memorySize ] = regexMatch;
-						return combineUtil.toMatcher(
-							memorySize ?
-								`${rxXxx}-${memorySize}GiB` :
-								new RegExp(`^${rxXxx}(-\\d+GiB)?$`)
-						);
+					if(hints.cleanName.includes("Radeon")){
+						return hints.cleanName;
 					}
+					return `Radeon-${hints.cleanName}`;
+				},
+			},
+			// RTX / GTX
+			{
+				nameTest: /^(GeForce.)?[RG]TX.([a-z])?[0-9]{3,4}(M)?(.Ti)?(.SUPER)?(.D)?(.Max.Q)?(.(\()?Mobile(\))?)?(.(\()?Laptop.GPU(\))?)?(.Ada.Generation)?\s*$/i,
+				brand: 'nvidia',
+				type: 'gpu',
+				parser: () => {
+					return hints.cleanName.replace("(Mobile)","Mobile").replace("Laptop-GPU","Mobile");
+				},
+			},
+			// passmark max-q- geekbench sometimes too
+			{
+				nameTest: /^(GeForce.)?[RG]TX.[0-9]{3,4}(M)?(.Ti)?(.Super)?(.D)?(.with.Max.Q.Design)\s*$/i,
+				brand: 'nvidia',
+				type: 'gpu',
+				parser: () => {
+					//passmark has max-q like `with Max-Q Design`
+					return hints.cleanName.replace('with-Max-Q-Design',"Max-Q");
+				},
+			},
+			// Titans
+			{
+				nameTest: /^(NVIDIA)?(GeForce)?(.[RG]TX)?TITAN(.[a-z]*)?/i,
+				brand: 'nvidia',
+				type: 'gpu',
+				parser: () => {
+					return hints.cleanName.replace(/titan/i,"TITAN");
+				}
+			},
+			// 3DMark special GTX
+			{
+				nameTest: /^Geforce.[0-9]{3,4}(M)?(.Ti)?(.SUPER)?(.D)?(.Max.Q)?\s*$/i,
+				brand: 'nvidia',
+				type: 'gpu',
+				parser: () => {
+					return hints.cleanName.replace('GeForce-', 'GeForce-GTX-');
+				},
+			},
+			// Quadro
+			{
+				nameTest: /^Quadro/i,
+				brand: 'nvidia',
+				type: 'gpu',
+				parser: () => {
+					//passmark has max-q like `with Max-Q Design`
+					return hints.cleanName.replace('with-Max-Q-Design',"Max-Q");
 				},
 			},
 			// Vega
@@ -116,6 +169,19 @@ const combineUtil = {
 						`RX-Vega-${num}`;
 				},
 			},
+			// Radeon R9/7/5
+			{
+				nameTest: /^(Radeon.)?R(5|7|8|9)/i,
+				brand: 'amd',
+				type: 'gpu',
+				parser: () => {
+
+					if(hints.cleanName.includes("Radeon")){
+						return hints.cleanName.replace("Fury", "FURY");
+					}
+					return `Radeon-${hints.cleanName.replace("Fury", "FURY")}`;
+				},
+			},
 			// Radeon VII
 			{
 				nameTest: /radeon.vii\s*$/i,
@@ -126,7 +192,7 @@ const combineUtil = {
 			},
 			// HD
 			{
-				nameTest: /HD-.*\d{4}(-|$)/,
+				nameTest: /^(Radeon.)?HD-.*\d{4}(-|$)/,
 				brand: 'amd',
 				type: 'gpu',
 				parser: () => {
@@ -163,9 +229,18 @@ const combineUtil = {
 					return hints.cleanName.replace('Ryzen-TR-', '');
 				}
 			},
+			// Epyc
+			{
+				nameTest: /^Epyc/i,
+				brand: 'amd',
+				type: 'cpu',
+				parser: () => {
+					return hints.cleanName.replace('EPYC-', 'Epyc-');
+				}
+			},
 			// simple Intel
 			{
-				nameTest: /^(Pentium|Core|Xeon|Celeron|Atom)/,
+				nameTest: /^(Pentium|Core|Xeon|Celeron|Atom|core)/,
 				brand: 'intel',
 				type: 'cpu',
 				parser: () => {