Repair transformation legality checks

.github/workflows/mirror-to-gitlab.yml

@@ -35,7 +35,7 @@ jobs:
 
 
       - name: Add GitLab remote (SSH)
-        run: git remote add gitlab ssh://git@git.dare.megware.com:2221/compilers/fortran-transpiler.git
+        run: git remote add gitlab ssh://git@git.dare.megware.com:2221/compilers/metafor.git
 
       # Push only the public namespaces (no refs/remotes/*)
       - name: Push branches

.github/workflows/nightly.yml

@@ -136,7 +136,6 @@ jobs:
       matrix:
         #node-version: ['latest', '22.x', '20.x']
         node-version: ['22.x', '20.x']
-        # node-gyp not working on the lastest windows (2025), needs to be updated
         os: [ubuntu-latest, windows-2022, macos-latest]
 
     runs-on: ${{ matrix.os }}

Fortran-JS/.gitignore

@@ -114,3 +114,9 @@ dist
 
 # TernJS port file
 .tern-port
+
+# Python cache files
+__pycache__/
+
+# Fujitsu script results
+metafor_fujitsu_results/

Fortran-JS/eslint.config.js

@@ -3,13 +3,17 @@ import tsdoc from "eslint-plugin-tsdoc";
 import jest from "eslint-plugin-jest";
 import js from "@eslint/js";
 import eslintConfigPrettier from "eslint-config-prettier";
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const tsconfigRootDir = dirname(fileURLToPath(import.meta.url));
 
 export default [
   js.configs.recommended,
   eslintConfigPrettier,
   ...typescriptEslint.configs.recommended,
   {
-    ignores: ["**/*.d.ts", "**/*.config.js"],
+    ignores: ["api/**", "code/**", "**/*.d.ts", "**/*.config.js"],
   },
   {
     plugins: {
@@ -18,13 +22,12 @@ export default [
     },
 
     languageOptions: {
-      tsconfigRootDir: __dirname,
-
       parser: typescriptEslint.parser,
       ecmaVersion: 5,
       sourceType: "script",
 
       parserOptions: {
+        tsconfigRootDir,
         project: ["./*/tsconfig.json", "./tsconfig.*.json"],
       },
     },

Fortran-JS/metafor_fujitsu_pipeline.py

@@ -132,7 +132,7 @@ def __init__(self, args: argparse.Namespace) -> None:
         self.noop_script_path.write_text(DEFAULT_NOOP_SCRIPT, encoding="utf-8")
 
     def discover_files(self) -> list[Path]:
-        files = sorted(self.fortran_root.rglob("*.f90"))
+        files = sorted(set(self.fortran_root.rglob("*.f90")) | set(self.fortran_root.rglob("*.f")))
         if self.args.limit:
             files = files[: self.args.limit]
         return files
@@ -146,7 +146,7 @@ def run(self) -> int:
 
         files = self.discover_files()
         if not files:
-            raise PipelineError(f"No .f90 files found under {self.fortran_root}")
+            raise PipelineError(f"No .f90 or .f files found under {self.fortran_root}")
 
         log(f"Discovered {len(files)} Fortran files")
 
@@ -254,7 +254,7 @@ def _stage3(self, path: Path) -> None:
         res = self.results[rel]
         work_dir = self._stage_work_dir(rel, "stage3")
         work_dir.mkdir(parents=True, exist_ok=True)
-        cmd = self._metafor_command(path)
+        cmd = self._metafor_command(path, work_dir)
         cr = self._run_command(cmd, cwd=work_dir, log_prefix=f"{safe_name(rel)}__stage3")
         res.stage3_elapsed_s = cr.elapsed_s
         if cr.returncode != 0:
@@ -289,7 +289,7 @@ def _stage41(self, path: Path) -> None:
         stage3_output = Path(res.stage3_output_file).resolve()
         work_dir = self._stage_work_dir(rel, "stage41")
         work_dir.mkdir(parents=True, exist_ok=True)
-        cmd = self._metafor_command(stage3_output)
+        cmd = self._metafor_command(stage3_output, work_dir)
         cr = self._run_command(cmd, cwd=work_dir, log_prefix=f"{safe_name(rel)}__stage41")
         res.stage41_elapsed_s = cr.elapsed_s
         if cr.returncode != 0:
@@ -334,10 +334,16 @@ def _stage42(self, path: Path) -> None:
             self._flang_ir_command(path, original_ir),
             log_prefix=f"{safe_name(rel)}__stage42_original",
         )
+        if cr1.returncode == 0 and (not original_ir.exists() or original_ir.stat().st_size == 0):
+            original_ir.write_text(cr1.stdout, encoding="utf-8")
+
         cr2 = self._run_command(
             self._flang_ir_command(stage3_output, regenerated_ir),
             log_prefix=f"{safe_name(rel)}__stage42_regenerated",
         )
+        if cr2.returncode == 0 and (not regenerated_ir.exists() or regenerated_ir.stat().st_size == 0):
+            regenerated_ir.write_text(cr2.stdout, encoding="utf-8")
+
         res.stage42_elapsed_s = cr1.elapsed_s + cr2.elapsed_s
         if cr1.returncode != 0 or cr2.returncode != 0:
             problems = []
@@ -352,7 +358,18 @@ def _stage42(self, path: Path) -> None:
         res.stage42_original_ir = str(original_ir)
         res.stage42_regenerated_ir = str(regenerated_ir)
 
-        same = self._normalized_ir_equal(original_ir, regenerated_ir)
+        original_norm = dest / "original.normalized.ll"
+        regenerated_norm = dest / "regenerated.normalized.ll"
+        original_norm.write_text(
+            normalize_llvm_ir(original_ir.read_text(encoding="utf-8", errors="replace")),
+            encoding="utf-8",
+        )
+        regenerated_norm.write_text(
+            normalize_llvm_ir(regenerated_ir.read_text(encoding="utf-8", errors="replace")),
+            encoding="utf-8",
+        )
+
+        same = files_are_identical(original_norm, regenerated_norm)
         res.stage42_ok = same
         res.stage42_note = "Normalized LLVM IR match" if same else "Normalized LLVM IR mismatch"
 
@@ -469,14 +486,16 @@ def _write_command_log(self, prefix: str, result: CommandResult) -> None:
     def _stage_work_dir(self, relative_file: str, stage_name: str) -> Path:
         return self.work_root / safe_name(relative_file) / stage_name
 
-    def _metafor_command(self, source_file: Path) -> list[str]:
+    def _metafor_command(self, source_file: Path, output_dir: Path) -> list[str]:
         return [
             self.args.npx,
             self.args.metafor_package,
             "classic",
             str(self.noop_script_path.resolve()),
             "-p",
             str(source_file.resolve()),
+            "-o",
+            str(output_dir),
         ]
 
     def _flang_ir_command(self, source_file: Path, output_file: Path) -> list[str]:
@@ -507,11 +526,6 @@ def _locate_generated_file(self, woven_code: Path, source_file: Path) -> Optiona
             return all_f90[0]
         return None
 
-    def _normalized_ir_equal(self, a_path: Path, b_path: Path) -> bool:
-        a = normalize_llvm_ir(a_path.read_text(encoding="utf-8", errors="replace"))
-        b = normalize_llvm_ir(b_path.read_text(encoding="utf-8", errors="replace"))
-        return a == b
-
     def _write_outputs(self, summary: Optional[dict] = None) -> None:
         results_csv = self.output_dir / "results.csv"
         summary_json = self.output_dir / "summary.json"
@@ -787,9 +801,11 @@ def write_csv(path: Path, rows: list[dict]) -> None:
 LLVM_IR_DROP_LINE_PATTERNS = [
     re.compile(r"^; ModuleID = "),
     re.compile(r'^source_filename = '),
-    re.compile(r"^!llvm\\.(module\\.flags|ident) = "),
-    re.compile(r"^!\\d+ = "),
-    re.compile(r"^attributes #\\d+ = "),
+    re.compile(r"^!llvm\.(module\.flags|ident) = "),
+    re.compile(r"^!\d+ = "),
+    re.compile(r"^attributes #\d+ = "),
+    re.compile(r'^[$@]_QQclX[0-9a-fA-F]+\s*='),
+    re.compile(r'^[$@]_QQclX<SRC>\s*='),
 ]
 
 
@@ -801,6 +817,8 @@ def write_csv(path: Path, rows: list[dict]) -> None:
     (re.compile(r",? !alias.scope ![0-9]+"), ""),
     (re.compile(r",? !noalias ![0-9]+"), ""),
     (re.compile(r",? !llvm.loop ![0-9]+"), ""),
+    (re.compile(r"(_QQclX)[0-9a-fA-F]+"), r"\1<SRC>"),
+    (re.compile(r"(@_QQclX<SRC>,\s*i32\s+)\d+"), r"\1<LINE>"),
 ]
 
 
@@ -827,7 +845,7 @@ def build_arg_parser() -> argparse.ArgumentParser:
         default="metafor_fujitsu_results",
         help="Directory where CSV/report/logs/artifacts will be written",
     )
-    p.add_argument("--flang", default="flang-20", help="flang executable")
+    p.add_argument("--flang", default="flang-22", help="flang executable")
     p.add_argument(
         "--dump-ast-plugin",
         default="./build/DumpASTPlugin.so",
@@ -846,7 +864,7 @@ def build_arg_parser() -> argparse.ArgumentParser:
     )
     p.add_argument("--jobs", type=int, default=max(1, (os.cpu_count() or 2) // 2), help="Parallel workers")
     p.add_argument("--timeout", type=int, default=120, help="Per-command timeout in seconds")
-    p.add_argument("--limit", type=int, default=0, help="Optional cap on number of .f90 files to process")
+    p.add_argument("--limit", type=int, default=0, help="Optional cap on number of Fortran files to process")
     p.add_argument("--node-path", default="", help="Optional NODE_PATH value")
     return p
 

Fortran-JS/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specs-feup/metafor",
-  "version": "22.0.0",
+  "version": "22.1.0",
   "description": "A Fortran source-to-source compiler written in Typescript",
   "type": "module",
   "files": [