refactor(frontend): change location format

compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/compilation_feedback.py

@@ -3,6 +3,7 @@
 
 """Compilation feedback."""
 
+import re
 from typing import Dict, Set
 
 # pylint: disable=no-name-in-module,import-error,too-many-instance-attributes
@@ -19,6 +20,10 @@
 from .wrapper import WrapperCpp
 
 
+# matches (@tag, separator( | ), filename)
+REGEX_LOCATION = r"loc\(\"(@[\w\.]+)?( \| )?(.+)\""
+
+
 class CompilationFeedback(WrapperCpp):
     """CompilationFeedback is a set of hint computed by the compiler engine."""
 
@@ -130,8 +135,9 @@ def count_per_tag(self, *, operations: Set[PrimitiveOperation]) -> Dict[str, int
             if statistic.operation not in operations:
                 continue
 
-            file_and_maybe_tag = statistic.location.split("@")
-            tag = "" if len(file_and_maybe_tag) == 1 else file_and_maybe_tag[1].strip()
+            tag, _, _ = re.match(REGEX_LOCATION, statistic.location).groups()
+            # remove the @
+            tag = tag[1:] if tag else ""
 
             tag_components = tag.split(".")
             for i in range(1, len(tag_components) + 1):
@@ -176,8 +182,9 @@ def count_per_tag_per_parameter(
             if statistic.operation not in operations:
                 continue
 
-            file_and_maybe_tag = statistic.location.split("@")
-            tag = "" if len(file_and_maybe_tag) == 1 else file_and_maybe_tag[1].strip()
+            tag, _, _ = re.match(REGEX_LOCATION, statistic.location).groups()
+            # remove the @
+            tag = tag[1:] if tag else ""
 
             tag_components = tag.split(".")
             for i in range(1, len(tag_components) + 1):

frontends/concrete-python/concrete/fhe/mlir/context.py

@@ -116,9 +116,15 @@ def location(self) -> MlirLocation:
         """
         Create an MLIR location from the node that is being converted.
         """
-
-        tag = "" if self.converting.tag == "" else f" @ {self.converting.tag}"
-        return MlirLocation.name(f"{self.converting.location}{tag}", context=self.context)
+        filename, lineno = self.converting.location.rsplit(":", maxsplit=1)
+
+        tag = "" if self.converting.tag == "" else f"@{self.converting.tag} | "
+        return MlirLocation.file(
+            f"{tag}{self.converting.location}",
+            line=int(lineno),
+            col=0,
+            context=self.context,
+        )
 
     def attribute(self, resulting_type: ConversionType, value: Any) -> MlirAttribute:
         """