carm-roofline 1.0.0.dev4__tar.gz → 1.0.0.dev5__tar.gz

{carm_roofline-1.0.0.dev4 → carm_roofline-1.0.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carm-roofline
-Version: 1.0.0.dev4
+Version: 1.0.0.dev5
 Summary: CARM: Cache-Aware Roofline Model benchmarking and visualization toolkit
 Author: CHaMP Team
 License:                   GNU LESSER GENERAL PUBLIC LICENSE
@@ -622,7 +622,7 @@ Other usage examples:
 # Short roofline benchmark (1 second per micro-bench)
 carm benchmark --test roofline --test-time 1
 # Arithmetic-only
-carm benchmark --test arithmetic --instruction add --data-type f32
+carm benchmark --test arithmetic --instruction add mul fma --data-type f32
 # Memory-only
 carm benchmark --test memory --mem-target L2 --ld-st-ratio 2:1
 # Dry run (generate benchmark code, skip compile/execute):
@@ -631,7 +631,7 @@ carm benchmark --dry-run --test arithmetic --test-time 1 --verbose 4
 
 ## Output and Results
 
-By default, results are written under the platform user data directory for the `carm` app (via platformdirs). On linux, this is typically `~/.local/share/carm/`, on Windows, `%APPDATA%\carm\`, and on MacOS, `~/Library/Application Support/carm/`.
+By default, results are written to the user data directory (via platformdirs). On linux, this is typically `~/.local/share/carm/`, on Windows, `%APPDATA%\carm\`, and on MacOS, `~/Library/Application Support/carm/`.
 
 Control output directory and format(s):
 

{carm_roofline-1.0.0.dev4 → carm_roofline-1.0.0.dev5}/README.md

@@ -75,7 +75,7 @@ Other usage examples:
 # Short roofline benchmark (1 second per micro-bench)
 carm benchmark --test roofline --test-time 1
 # Arithmetic-only
-carm benchmark --test arithmetic --instruction add --data-type f32
+carm benchmark --test arithmetic --instruction add mul fma --data-type f32
 # Memory-only
 carm benchmark --test memory --mem-target L2 --ld-st-ratio 2:1
 # Dry run (generate benchmark code, skip compile/execute):
@@ -84,7 +84,7 @@ carm benchmark --dry-run --test arithmetic --test-time 1 --verbose 4
 
 ## Output and Results
 
-By default, results are written under the platform user data directory for the `carm` app (via platformdirs). On linux, this is typically `~/.local/share/carm/`, on Windows, `%APPDATA%\carm\`, and on MacOS, `~/Library/Application Support/carm/`.
+By default, results are written to the user data directory (via platformdirs). On linux, this is typically `~/.local/share/carm/`, on Windows, `%APPDATA%\carm\`, and on MacOS, `~/Library/Application Support/carm/`.
 
 Control output directory and format(s):
 

{carm_roofline-1.0.0.dev4 → carm_roofline-1.0.0.dev5}/architecture/architecture.py

@@ -103,6 +103,36 @@ class ISAFrequencies:
             base_frequency = Frequency(base_frequency)
         return ISAFrequencies({isa.name: base_frequency for isa in isas})
 
+    @staticmethod
+    def from_detected(detected: DetectedArchitecture, isa_list: list[type[BaseISA]]) -> ISAFrequencies:
+        """Create ISAFrequencies from auto-detected architecture data.
+
+        Initializes all ISAs to the base frequency, then overrides with any per-ISA
+        specific frequencies that were detected.
+
+        Args:
+            detected: DetectedArchitecture object from probing
+            isa_list: List of ISA classes for this architecture
+
+        Returns:
+            ISAFrequencies with appropriate frequencies from detected data
+
+        Raises:
+            ValueError: If no frequency information is available
+        """
+        base_freq = detected.frequency
+        if not base_freq:
+            raise ValueError("Frequency could not be auto-detected, specify it using --frequency <freq>")
+
+        # Start with all ISAs at base frequency
+        isa_freqs_dict = {isa.name: base_freq for isa in isa_list}
+
+        # Override with any specific ISA frequencies that were detected
+        if detected.isa_frequencies:
+            isa_freqs_dict.update(detected.isa_frequencies)
+
+        return ISAFrequencies(isa_freqs_dict)
+
     def __getitem__(self, isa_name: str) -> Frequency:
         """Get frequency for a specific ISA.
 
@@ -111,6 +141,9 @@ class ISAFrequencies:
 
         Returns:
             Frequency wrapper for that ISA
+
+        Raises:
+            KeyError: If ISA not found
         """
         return self._isa_frequencies[isa_name]
 
@@ -177,7 +210,7 @@ class Architecture(InsertsArguments):
                 "Specify them using a TOML config file with --topology-config <path>"
             )
 
-        # Handle frequency: user arg (Frequency wrapper) overrides all, otherwise use detected per-ISA frequencies
+        # Handle frequency: user arg (Frequency wrapper) overrides all, otherwise use detected
         if args.frequency is not None:
             # args.frequency is already a Frequency wrapper from frequency_type()
             self.frequency = ISAFrequencies.from_base_frequency(args.frequency, self.isa)
@@ -185,14 +218,7 @@ class Architecture(InsertsArguments):
                 d_freq = detected.frequency if detected.isa_frequencies is None else detected.isa_frequencies
                 _override_warn("frequency", args.frequency, d_freq)
         else:
-            isa_freqs = detected.isa_frequencies
-            # if there are isa-specific frequencies, use them; otherwise fall back to base frequency if available
-            if isa_freqs:
-                self.frequency = ISAFrequencies(isa_freqs)
-            elif base_freq := detected.frequency:
-                self.frequency = ISAFrequencies.from_base_frequency(base_freq, self.isa)
-            else:
-                raise ValueError("Frequency could not be auto-detected, specify it using --frequency <freq>")
+            self.frequency = ISAFrequencies.from_detected(detected, self.isa)
 
         self.nominal_frequency: Frequency | None = detected.frequency_nominal
 

{carm_roofline-1.0.0.dev4 → carm_roofline-1.0.0.dev5}/carm_roofline.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carm-roofline
-Version: 1.0.0.dev4
+Version: 1.0.0.dev5
 Summary: CARM: Cache-Aware Roofline Model benchmarking and visualization toolkit
 Author: CHaMP Team
 License:                   GNU LESSER GENERAL PUBLIC LICENSE
@@ -622,7 +622,7 @@ Other usage examples:
 # Short roofline benchmark (1 second per micro-bench)
 carm benchmark --test roofline --test-time 1
 # Arithmetic-only
-carm benchmark --test arithmetic --instruction add --data-type f32
+carm benchmark --test arithmetic --instruction add mul fma --data-type f32
 # Memory-only
 carm benchmark --test memory --mem-target L2 --ld-st-ratio 2:1
 # Dry run (generate benchmark code, skip compile/execute):
@@ -631,7 +631,7 @@ carm benchmark --dry-run --test arithmetic --test-time 1 --verbose 4
 
 ## Output and Results
 
-By default, results are written under the platform user data directory for the `carm` app (via platformdirs). On linux, this is typically `~/.local/share/carm/`, on Windows, `%APPDATA%\carm\`, and on MacOS, `~/Library/Application Support/carm/`.
+By default, results are written to the user data directory (via platformdirs). On linux, this is typically `~/.local/share/carm/`, on Windows, `%APPDATA%\carm\`, and on MacOS, `~/Library/Application Support/carm/`.
 
 Control output directory and format(s):
 

{carm_roofline-1.0.0.dev4 → carm_roofline-1.0.0.dev5}/carm_roofline.egg-info/SOURCES.txt

@@ -76,6 +76,10 @@ gui/assets/CARM_icon.svg
 gui/assets/CHAMP_logo.svg
 gui/assets/menu_icon.png
 gui/assets/style.css
+test/test_isa_codegen_integration.py
+test/test_memory_suite_generation.py
+test/test_output_module.py
+test/test_typed_benchmarks.py
 test_bench/__init__.py
 test_bench/builder.py
 test_bench/test_bench.c

{carm_roofline-1.0.0.dev4 → carm_roofline-1.0.0.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "carm-roofline"
-version = "1.0.0.dev4"
+version = "1.0.0.dev5"
 description = "CARM: Cache-Aware Roofline Model benchmarking and visualization toolkit"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -112,7 +112,7 @@ exclude = [
     "test_bench",
     "Test",
     "CustomClient",
-    "refactor_tests",  # Test code with temporary workarounds
+    "test",  # Test code with temporary workarounds
     "venv",
     ".venv*"
 ]
@@ -171,7 +171,7 @@ line-ending = "lf"
 
 [tool.pytest.ini_options]
 minversion = "7.0"
-testpaths = ["refactor_tests"]
+testpaths = ["test"]
 python_files = ["test_*.py"]
 python_classes = ["Test*"]
 python_functions = ["test_*"]
@@ -208,7 +208,7 @@ warn_unused_configs = true
 # Exclude legacy code from type checking
 exclude = [
     "legacy_bench_gen/",
-    "refactor_tests/",
+    "test/",
     "run.py",
     "run_gpu.py",
     ".*AI_Calculator.py",