Implement sorted levenshtein distance checking

Based on sidsethupathi@c9e32ba

Author: puckey

scripts/update_benchmarks.ts

@@ -7,6 +7,7 @@ import fs from 'fs';
 // Application
 import { BLOCKLISTED_GPUS } from '../src/internal/blocklistedGPUS';
 import { getGPUVersion } from '../src/internal/getGPUVersion';
+import { tokenizeForLevenshteinDistance } from '../src/internal/getLevenshteinDistance';
 import { internalBenchmarkResults } from './internalBenchmarkResults';
 import { BenchmarkRow } from './types';
 
@@ -120,6 +121,7 @@ type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
             ({ gpu, gpuVersion, blocklisted, devices }) => [
               gpu,
               gpuVersion,
+              tokenizeForLevenshteinDistance(gpu),
               blocklisted ? 1 : 0,
               devices.map(({ width, height, fps, device }) =>
                 isMobile ? [width, height, fps, device] : [width, height, fps]

src/index.ts

@@ -6,12 +6,15 @@ import { BLOCKLISTED_GPUS } from './internal/blocklistedGPUS';
 import { cleanRenderer } from './internal/cleanRenderer';
 import { deobfuscateRenderer } from './internal/deobfuscateRenderer';
 import { deviceInfo } from './internal/deviceInfo';
-import { getLevenshteinDistance } from './internal/getLevenshteinDistance';
+import { OutdatedBenchmarksError } from './internal/error';
 import { getGPUVersion } from './internal/getGPUVersion';
+import {
+  getLevenshteinDistance,
+  tokenizeForLevenshteinDistance
+} from './internal/getLevenshteinDistance';
 import { getWebGLContext } from './internal/getWebGLContext';
 import { isSSR } from './internal/ssr';
 import { isDefined } from './internal/util';
-import { OutdatedBenchmarksError } from './internal/error';
 
 // Types
 export interface GetGPUTier {
@@ -87,7 +90,7 @@ export type TierResult = {
 
 export type ModelEntryScreen = [number, number, number, string | undefined];
 
-export type ModelEntry = [string, string, 0 | 1, ModelEntryScreen[]];
+export type ModelEntry = [string, string, string, 0 | 1, ModelEntryScreen[]];
 
 const debug = false ? console.log : undefined;
 
@@ -196,13 +199,20 @@ export const getGPUTier = async ({
       return;
     }
 
+    const tokenizedRenderer = tokenizeForLevenshteinDistance(renderer);
     // eslint-disable-next-line prefer-const
-    let [gpu, , , fpsesByPixelCount] =
+    let [gpu, , , , fpsesByPixelCount] =
       matchCount > 1
         ? matched
             .map(
               (match) =>
-                [match, getLevenshteinDistance(renderer, match[0])] as const
+                [
+                  match,
+                  getLevenshteinDistance(
+                    tokenizedRenderer,
+                    match[2]
+                  ),
+                ] as const
             )
             .sort(([, a], [, b]) => a - b)[0][0]
         : matched[0];
@@ -240,7 +250,7 @@ export const getGPUTier = async ({
     const [, , fps, device] = closest!;
 
     return [minDistance, fps, gpu, device] as const;
-  };
+  }
 
   const toResult = (
     tier: number,

src/internal/getLevenshteinDistance.ts

@@ -83,3 +83,12 @@ export function getLevenshteinDistance(left: string, right: string): number {
 
   return result;
 }
+
+export function tokenizeForLevenshteinDistance(str: string): string {
+  return str
+    .split(/[.,()\[\]/\s]/g)
+    .sort()
+    // Remove duplicates
+    .filter((item, pos, arr) => pos === 0 || item !== arr[pos - 1])
+    .join(' ');
+}

test/index.test.ts

@@ -92,7 +92,7 @@ for (const { input, expected } of [
   },
   {
     expected: {
-      gpu: 'nvidia geforce rtx 2080 ti rev. a',
+      gpu: 'nvidia geforce rtx 2080 ti',
     },
     input: {
       isMobile: false,
@@ -168,7 +168,7 @@ for (const { input, expected } of [
   },
   {
     expected: {
-      gpu: 'nvidia geforce gtx 750 ti',
+      gpu: 'nvidia geforce gtx 750',
     },
     input: {
       isMobile: false,
@@ -231,7 +231,7 @@ for (const { input, expected } of [
   },
   {
     expected: {
-      gpu: 'nvidia evga geforce gtx 970',
+      gpu: 'nvidia geforce gtx 970',
     },
     input: {
       isMobile: false,