remove netlist leakage into this branch

Author: desmonddak

lib/src/diagnostics/module_services.dart

@@ -60,9 +60,8 @@ class ModuleServices {
   SvService? svService;
 
   /// Returns SV synthesis metadata as JSON, or an unavailable status.
-  String get svJSON => svService != null
-      ? jsonEncode(svService!.toJson())
-      : _unavailable('sv');
+  String get svJSON =>
+      svService != null ? jsonEncode(svService!.toJson()) : _unavailable('sv');
 
   // ─── Helpers ──────────────────────────────────────────────────
 

lib/src/synthesizers/systemverilog/sv_service.dart

@@ -47,8 +47,7 @@ class SvService {
   /// DevTools access.
   SvService(this.module, {bool register = true}) {
     if (!module.hasBuilt) {
-      throw Exception(
-          'Module must be built before creating SvService. '
+      throw Exception('Module must be built before creating SvService. '
           'Call build() first.');
     }
 
@@ -65,8 +64,7 @@ class SvService {
 
   /// Returns the concatenated SystemVerilog output as a single string,
   /// matching the format of [Module.generateSynth].
-  String get allContents =>
-      fileContents.map((fc) => fc.contents).join('\n\n');
+  String get allContents => fileContents.map((fc) => fc.contents).join('\n\n');
 
   /// Returns a map from module definition name to its SV file contents.
   ///

lib/src/utilities/simcompare.dart

@@ -425,14 +425,22 @@ abstract class SimCompare {
 
     if (!dontDeleteTmpFiles) {
       try {
-        File(tmpOutput).deleteSync();
-        File(tmpTestFile).deleteSync();
+        final outFile = File(tmpOutput);
+        if (outFile.existsSync()) {
+          outFile.deleteSync();
+        }
+        final testFile = File(tmpTestFile);
+        if (testFile.existsSync()) {
+          testFile.deleteSync();
+        }
         if (dumpWaves) {
-          File(tmpVcdFile).deleteSync();
+          final vcdFile = File(tmpVcdFile);
+          if (vcdFile.existsSync()) {
+            vcdFile.deleteSync();
+          }
         }
       } on Exception catch (e) {
         print("Couldn't delete: $e");
-        return false;
       }
     }
     return true;
@@ -496,54 +504,6 @@ abstract class SimCompare {
     return _pchPath = pchDir;
   }
 
-  /// Cached path to the shared Makefile (one per compiler-flags combination).
-  static String? _makefilePath;
-
-  /// Creates a shared Makefile once, reused for all compilations.
-  /// TARGET and SRC are passed as make variables at invocation time.
-  /// Uses atomic write (write-to-temp + rename) to avoid races when
-  /// multiple test isolates create the file concurrently.
-  static String _ensureMakefile({
-    required String dir,
-    required String cxxStd,
-    required String pchInclude,
-    required String scHome,
-    required String scLib,
-  }) {
-    final path = '$dir/Makefile_sc';
-
-    if (_makefilePath != null && File(path).existsSync()) {
-      return _makefilePath!;
-    }
-
-    // If already on disk from another isolate, just reuse it
-    if (File(path).existsSync()) {
-      return _makefilePath = path;
-    }
-
-    final contents = '''
-CXX = g++
-CXXFLAGS = -std=$cxxStd -pipe $pchInclude-I$scHome
-LDFLAGS = -L$scLib -lsystemc
-
-all: \$(TARGET)
-
-\$(TARGET): \$(SRC)
-\t\$(CXX) \$(CXXFLAGS) -o \$(TARGET) \$(SRC) \$(LDFLAGS)
-
-.PHONY: all
-''';
-    Directory(dir).createSync(recursive: true);
-
-    // Atomic write: write to temp file, then rename so concurrent
-    // readers never see a truncated Makefile.
-    File('$path.${pid.hashCode}')
-      ..writeAsStringSync(contents)
-      ..renameSync(path);
-
-    return _makefilePath = path;
-  }
-
   /// Resolves SystemC home/lib paths. If explicit paths are given, uses them.
   /// Otherwise uses the default Accellera install paths.
   static (String?, String?) _resolveSystemCPaths(String scHome, String scLib) {
@@ -587,7 +547,6 @@ all: \$(TARGET)
   static void cleanupSystemCCache({bool keepPch = true}) {
     _compilationCache.clear();
     _pchPath = null;
-    _makefilePath = null;
     if (kIsWeb) {
       return;
     }
@@ -596,9 +555,14 @@ all: \$(TARGET)
       if (dir.existsSync()) {
         if (keepPch) {
           for (final entity in dir.listSync()) {
+            final name = entity.uri.pathSegments.last;
+            // Only remove SystemC artifacts (tmp_sc_*), preserve iverilog files
             if (entity is Directory && entity.path.endsWith('/pch')) {
               continue;
             }
+            if (!name.startsWith('tmp_sc_') && name != 'Makefile_sc') {
+              continue;
+            }
             entity.deleteSync(recursive: true);
           }
         } else {
@@ -844,19 +808,19 @@ all: \$(TARGET)
 
     // Build precompiled header on first use
     final pchDir = _ensurePch(resolvedHome, cxxStd);
-    final pchInclude = pchDir != null ? '-I$pchDir ' : '';
-
-    // Create shared Makefile once (keyed by compiler flags)
-    final makefile = _ensureMakefile(
-      dir: dir,
-      cxxStd: cxxStd,
-      pchInclude: pchInclude,
-      scHome: resolvedHome,
-      scLib: resolvedLib,
-    );
+    final pchArgs = pchDir != null ? ['-I$pchDir'] : <String>[];
 
-    final compileResult = Process.runSync(
-        'make', ['-f', makefile, 'TARGET=$tmpOutput', 'SRC=$tmpCppFile']);
+    final compileResult = Process.runSync('g++', [
+      '-std=$cxxStd',
+      '-pipe',
+      ...pchArgs,
+      '-I$resolvedHome',
+      '-o',
+      tmpOutput,
+      tmpCppFile,
+      '-L$resolvedLib',
+      '-lsystemc',
+    ]);
     if (compileResult.exitCode != 0) {
       print('SystemC compilation failed:');
       print(compileResult.stdout);

test/module_services_test.dart

@@ -21,9 +21,7 @@ class SimpleModule extends Module {
 }
 
 void main() {
-  tearDown(() {
-    ModuleServices.instance.reset();
-  });
+  tearDown(ModuleServices.instance.reset);
 
   group('ModuleServices', () {
     test('rootModule is set after build', () async {

tool/gh_actions/setup_systemc_pch.sh

@@ -40,26 +40,3 @@ g++ -std="$CXX_STD" -I"$SC_HOME" -x c++-header \
     -o "$PCH_DIR/systemc.h.gch" "$SC_HOME/systemc.h"
 
 echo "PCH built: $PCH_DIR/systemc.h.gch"
-
-# Pre-create the shared Makefile
-MAKEFILE="tmp_test/Makefile_sc"
-cat > "$MAKEFILE" <<'EOF'
-CXX = g++
-CXXFLAGS = -std=__CXX_STD__ -pipe -I__PCH_DIR__ -I__SC_HOME__
-LDFLAGS = -L__SC_LIB__ -lsystemc
-
-all: $(TARGET)
-
-$(TARGET): $(SRC)
-	$(CXX) $(CXXFLAGS) -o $(TARGET) $(SRC) $(LDFLAGS)
-
-.PHONY: all
-EOF
-
-# Substitute paths into the Makefile
-sed -i "s|__CXX_STD__|$CXX_STD|g" "$MAKEFILE"
-sed -i "s|__PCH_DIR__|$PCH_DIR|g" "$MAKEFILE"
-sed -i "s|__SC_HOME__|$SC_HOME|g" "$MAKEFILE"
-sed -i "s|__SC_LIB__|$SC_LIB|g" "$MAKEFILE"
-
-echo "Makefile created: $MAKEFILE"