called unfragment on df once, simplified clock speed detection, corre…

…ct line type for regression line
owensgroup · Apr 28, 2024 · ac3f0fe · ac3f0fe
1 parent 2b8fd6a
commit ac3f0fe
Show file tree

Hide file tree

Showing 24 changed files with 163 additions and 162 deletions.
diff --git a/nvperf.py b/nvperf.py
@@ -246,12 +246,13 @@ def merge(df, dst, src, replaceNoWithNaN=False, delete=True):
 df = merge(df, "TDP (Watts)", "TDP (W)")
 df = merge(df, "TDP (Watts)", "Combined TDP Max. (W)")
 df = merge(df, "TDP (Watts)", "TDP /idle (Watts)")
+df = df.copy()  # this unfragments the df, better performance
 # get only the number out of {TBP,TDP}
 for col in ["TBP", "TDP"]:
     df[f"{col} (extracted)"] = pd.to_numeric(
         df[col].str.extract(r"(\d+)", expand=False)
     )
-    df = merge(df, "TDP (Watts)", f"{col} (extracted)", delete=False)
+    df = merge(df, "TDP (Watts)", f"{col} (extracted)")
 
 df = merge(df, "Model", "Model (Architecture)")  # could separate out uarch
 df = merge(df, "Model", "Model (Codename)")
@@ -373,13 +374,11 @@ def merge(df, dst, src, replaceNoWithNaN=False, delete=True):
         pd.to_numeric(dftds[1], errors="coerce")
     )
 
-# some AMD chips have core/boost in same entry, take first number
-# df["Core clock (MHz)"] = df["Core clock (MHz)"].astype(str).str.split(" ").str[0]
-df["Core clock (MHz)"] = df["Core clock (MHz)"].str.extract(r"(\d+)")
+# Simple treatment of Core clock and bus width: just grab the first number
+for col in ["Core clock (MHz)", "Memory Bus width (bit)"]:
+    df[col] = df[col].apply(lambda x: str(x))
+    df[col] = df[col].str.extract(r"(\d+)")
 
-# Simple treatment of bus width: just grab the first number
-df["Memory Bus width (bit)"] = df["Memory Bus width (bit)"].apply(lambda x: str(x))
-df["Memory Bus width (bit)"] = df["Memory Bus width (bit)"].str.extract(r"(\d+)")
 # strip out bit width from combined column
 df = merge(df, "Memory Bus type & width (bit)", "Memory Bus type & width")
 df["bus"] = df["Memory Bus type & width (bit)"].str.extract(r"(\d+)-bit", expand=False)
@@ -856,6 +855,8 @@ def stripShorthand(str):
         .add_params(shape_selection)
     )
 
+    regression_method = {"linear": "linear", "log": "exp"}
+
     lchart = (
         (
             alt.layer(
@@ -864,7 +865,7 @@ def stripShorthand(str):
                     on=stripShorthand(c["x"]),
                     regression=stripShorthand(c["y"]),
                     # groupby=[stripShorthand(c["color"])],
-                    method=c["yscale"],
+                    method=regression_method[c["yscale"]],
                 ).mark_line(),
             )
         )

diff --git a/plots/Arithmetic Intensity over Time.html b/plots/Arithmetic Intensity over Time.html
diff --git a/plots/Arithmetic Intensity vs. Memory Bandwidth.html b/plots/Arithmetic Intensity vs. Memory Bandwidth.html
diff --git a/plots/Arithmetic Intensity vs. Peak Processing Power.html b/plots/Arithmetic Intensity vs. Peak Processing Power.html
diff --git a/plots/Clock rate over Time.html b/plots/Clock rate over Time.html
diff --git a/plots/Clock rate over Time.pdf b/plots/Clock rate over Time.pdf
diff --git a/plots/Die Size over Time.html b/plots/Die Size over Time.html
diff --git a/plots/Feature size over Time.html b/plots/Feature size over Time.html
diff --git a/plots/GFLOPS per Area vs. GFLOPS per Watt.html b/plots/GFLOPS per Area vs. GFLOPS per Watt.html
diff --git a/plots/GFLOPS per Dollar over Time.html b/plots/GFLOPS per Dollar over Time.html
diff --git a/plots/GFLOPS per Watt over Time.html b/plots/GFLOPS per Watt over Time.html
diff --git a/plots/GFLOPS per Watt vs. Memory Bandwidth.html b/plots/GFLOPS per Watt vs. Memory Bandwidth.html
diff --git a/plots/GFLOPS per Watt vs. Peak Processing Power.html b/plots/GFLOPS per Watt vs. Peak Processing Power.html
diff --git a/plots/Memory Bandwidth over Time.html b/plots/Memory Bandwidth over Time.html
diff --git a/plots/Memory Bandwidth per Pin over Time.html b/plots/Memory Bandwidth per Pin over Time.html
diff --git a/plots/Memory Bus Width over Time.html b/plots/Memory Bus Width over Time.html
diff --git a/plots/Power density over Time.html b/plots/Power density over Time.html
diff --git a/plots/Power over Time.html b/plots/Power over Time.html
diff --git a/plots/Processing Power over Time.html b/plots/Processing Power over Time.html
diff --git a/plots/Release price over Time.html b/plots/Release price over Time.html
diff --git a/plots/SM count over Time.html b/plots/SM count over Time.html
diff --git a/plots/Shader count over Time.html b/plots/Shader count over Time.html
diff --git a/plots/Transistor Count over Time.html b/plots/Transistor Count over Time.html
diff --git a/plots/Transistor density over Time.html b/plots/Transistor density over Time.html