Cleaner sanitization

Author: danielholanda

skills/apu-memory-tuner/scripts/apply_profile.py

@@ -61,8 +61,6 @@
 from dataclasses import dataclass
 from pathlib import Path
 
-from _sanitize import sanitize_process_output
-
 PAGE_SIZE_BYTES = 4096
 MIN_VRAM_GB = 0.5    # Floor most BIOSes allow for the UMA frame buffer.
 MIN_GTT_GB = 1.0     # Below this, even routine GPU work fails.
@@ -83,15 +81,12 @@ class ProfileTargets:
 def _run(cmd: list[str], timeout: float = 60.0) -> tuple[int, str, str]:
     try:
         r = subprocess.run(
-            cmd, capture_output=True, text=True, timeout=timeout, check=False,
-        )
-        return (
-            r.returncode,
-            sanitize_process_output(r.stdout),
-            sanitize_process_output(r.stderr),
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            text=True, timeout=timeout, check=False,
         )
+        return r.returncode, r.stdout or "", r.stderr or ""
     except (FileNotFoundError, subprocess.SubprocessError, OSError) as e:
-        return 127, "", sanitize_process_output(str(e))
+        return 127, "", str(e)
 
 
 def _read_text(path: str) -> str:

skills/apu-memory-tuner/scripts/detect_platform.py

@@ -36,8 +36,6 @@
 from dataclasses import asdict, dataclass, field
 from pathlib import Path
 
-from _sanitize import sanitize_process_output
-
 # Mapping from LLVM gfx target to the marketing-friendly generation bucket
 # the rest of the skill keys off. RDNA3.5 (gfx115x) is the only generation
 # the source ROCm doc describes shared-memory tuning for, so it is the only
@@ -91,13 +89,10 @@ def _run(cmd: list[str], timeout: float = 5.0) -> tuple[int, str, str]:
     """Run a command; return (exit, stdout, stderr). Never raises."""
     try:
         r = subprocess.run(
-            cmd, capture_output=True, text=True, timeout=timeout, check=False,
-        )
-        return (
-            r.returncode,
-            sanitize_process_output(r.stdout),
-            sanitize_process_output(r.stderr),
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            text=True, timeout=timeout, check=False,
         )
+        return r.returncode, r.stdout or "", r.stderr or ""
     except (FileNotFoundError, subprocess.SubprocessError, OSError):
         return 127, "", ""
 

skills/apu-memory-tuner/scripts/show_config.py

@@ -36,8 +36,6 @@
 from dataclasses import asdict, dataclass
 from pathlib import Path
 
-from _sanitize import sanitize_process_output
-
 # 4 KiB is the page size assumed by the amdgpu/TTM accounting on every
 # platform we target. The kernel param is in pages, the user thinks in GB.
 PAGE_SIZE_BYTES = 4096
@@ -64,13 +62,10 @@ class Config:
 def _run(cmd: list[str], timeout: float = 10.0) -> tuple[int, str, str]:
     try:
         r = subprocess.run(
-            cmd, capture_output=True, text=True, timeout=timeout, check=False,
-        )
-        return (
-            r.returncode,
-            sanitize_process_output(r.stdout),
-            sanitize_process_output(r.stderr),
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            text=True, timeout=timeout, check=False,
         )
+        return r.returncode, r.stdout or "", r.stderr or ""
     except (FileNotFoundError, subprocess.SubprocessError, OSError):
         return 127, "", ""