Compiler: move c2_trace functions to libs/trace/c2_trace.c2

chqrlie · chqrlie · commit e3cfb41bf59f · 2025-08-16T13:23:47.000+02:00
* add **generator/c2_trace.c2** source module. This file is incorporated in the compiler using the @embed attribute * add **libs/c2/c2_trace_tables.c2i** to define the types and tables generated by the compiler when call tracing is enabled. * generate call tracing tables in **c2_trace_tables.c** for fast builds
diff --git a/common/build_target.c2 b/common/build_target.c2
@@ -100,7 +100,7 @@ public type File struct {
 }
 
 public type Target struct @(opaque) {
-    u32 name_idx;       // into aux pool
+    u32 name_idx;       // index into auxPool
     SrcLoc loc;
     warning_flags.Flags warnings;
     Kind kind;
diff --git a/compiler/compiler.c2 b/compiler/compiler.c2
@@ -199,6 +199,8 @@ fn component.Kind target2compKind(build_target.Kind k) {
     return component.Kind.Executable;
 }
 
+const char[] C2_trace @(embed="generator/c2_trace.c2");
+
 fn void Compiler.build(Compiler* c,
                          string_pool.Pool* auxPool,
                          source_mgr.SourceMgr* sm,
@@ -296,6 +298,8 @@ fn void Compiler.build(Compiler* c,
     if (opts.msan) c.addFeature("__MSAN__", "1");
     if (opts.ubsan) c.addFeature("__UBSAN__", "1");
 
+    target.addLib(c.auxPool.add("c2", 2, true), false);
+
     c.parser = c2_parser.create(sm,
                                 diags,
                                 c.astPool,
@@ -362,14 +366,21 @@ fn void Compiler.build(Compiler* c,
         const build_target.File* f = target.getFile(j);
         i32 file_id = sm.open(f.name, f.loc, true);
         if (file_id == -1) return;   // note: error already printed
-
         console.debug("parsing %s", sm.getFileName(file_id));
 
         // parse error indicator updated in c.parser state
         c.parser.parse(file_id, false, false);
-
         sm.close(file_id);
     }
+    if (c.opts.trace_calls) {
+        i32 file_id = sm.addResource(c.auxPool.addStr("generator/c2_trace.c2", true),
+                                     C2_trace, elemsof(C2_trace) - 1);
+        if (file_id == -1) return;   // note: error already printed
+        console.debug("parsing %s", sm.getFileName(file_id));
+        c.parser.parse(file_id, false, false);
+        sm.close(file_id);
+    }
+
     u64 t1_end = utils.now();
     console.log_time("parsing", t1_end - t1_start);
     if (!c.diags.isOk()) return;
diff --git a/compiler/main.c2 b/compiler/main.c2
@@ -594,8 +594,6 @@ fn bool Context.build_target(Context* c,
         }
     }
 
-    target.addLib(c.auxPool.add("c2", 2, true), false);
-
     compiler.build(c.auxPool, c.sm, c.diags, c.build_info, target, &c.comp_opts, &c.pluginHandler);
 
     // TODO unload target-specific plugins?
diff --git a/generator/c/c_generator.c2 b/generator/c/c_generator.c2
@@ -79,6 +79,7 @@ type Generator struct {
     bool msan;
     bool ubsan;
     bool trace_calls;
+    bool no_trace;  //to disable tracing on c2_trace module
 
     // set during generation
     bool cur_external;  // whether current component is external
@@ -1058,6 +1059,9 @@ fn void Generator.on_module(void* arg, Module* m) {
     gen.mod_name = m.getName();
     gen.mod = m;
 
+    // Temporary disable call tracing when compiling the c2_trace module
+    gen.no_trace = !string.strcmp(gen.mod_name, "c2_trace");
+
     if (gen.fast_build) {
         out.clear();
         gen.header.clear();
@@ -1268,9 +1272,17 @@ public fn void generate(string_pool.Pool* astPool,
 
     mainComp.visitModules(Generator.on_module, &gen);
 
-    if (fast_build) gen.out.clear();
-    if (gen.trace_calls) gen.writeCalls(gen.out);
-    if (!fast_build || gen.trace_calls) {
+    if (fast_build) {
+        if (gen.trace_calls) {
+            gen.out.clear();
+            gen.out.add("#include \"c2_trace_tables.h\"\n\n");
+            gen.writeCalls(gen.out);
+            gen.write(dir, "c2_trace_tables.c", gen.out);
+        }
+    } else {
+        if (gen.trace_calls) {
+            gen.writeCalls(gen.out);
+        }
         gen.write(dir, "build.c", gen.out);
     }
 
diff --git a/generator/c/c_generator_call.c2 b/generator/c/c_generator_call.c2
@@ -54,7 +54,7 @@ fn void Generator.emitCall(Generator* gen, string_buffer.Buf* out, Expr* e) {
             assert(func.getKind() == ExprKind.Member);
             MemberExpr* m = cast<MemberExpr*>(func);
             dest = m.getFullDecl();
-            if (gen.trace_calls) {
+            if (gen.trace_calls && !gen.no_trace) {
                 out.print("(c2_trace_counts[%d]++, ",
                           gen.addCall(dest.getFullName(), call.getStartLoc()));
                 gen.emitCNameMod(out, dest, dest.getModule());
@@ -78,7 +78,7 @@ fn void Generator.emitCall(Generator* gen, string_buffer.Buf* out, Expr* e) {
                 gen.emitMemberExprBase(out, func);
             }
         } else {
-            bool no_trace = false;
+            bool no_trace = gen.no_trace;
             // can be Member or Identifier
             if (func.getKind() == ExprKind.Identifier) {
                 IdentifierExpr* i = cast<IdentifierExpr*>(func);
diff --git a/generator/c/c_generator_special.c2 b/generator/c/c_generator_special.c2
@@ -105,7 +105,7 @@ fn void Generator.createMakefile(Generator* gen,
             if (!m.isExternal() && m.isUsed()) out.print(" %s.o", m.getName());
         }
         if (gen.trace_calls) {
-            out.add(" build.o");
+            out.add(" c2_trace_tables.o");
         }
         out.newline();
     } else {
diff --git a/generator/c/c_generator_trace.c2 b/generator/c/c_generator_trace.c2
@@ -169,196 +169,34 @@ fn void Generator.writeCalls(Generator* gen, string_buffer.Buf* out) {
     if (!gen.trace_calls)
         return;
 
-    out.add("static const char *c2_filenames[] = {\n");
+    out.add("const char *c2_filenames[] = {\n");
     u32 n = gen.filenames.length();
     for (u32 i = 0; i < n; i++) {
         out.print("    \"%s\",\n", gen.filenames.get(i));
     }
     out.add("};\n\n");
 
-    out.add(
-    ```c
-    struct c2_func_t {
-        unsigned count;
-        unsigned short filename_idx;
-        unsigned short line;
-        const char *funcname;
-    };
-    static struct c2_func_t c2_func_data[] = {
-    ```);
+    out.add("c2_func_t c2_func_data[] = {\n");
+
     // TODO: store function definition location
     n = gen.funcnames.length();
     for (u32 i = 0; i < n; i++) {
         out.print("    { 0, 0, 0, \"%s\" },\n", gen.funcnames.get(i));
     }
-    out.add(
-    ```c
-    };
+    out.add("};\n\n");
 
-    struct c2_trace_t {
-        unsigned count;
-        unsigned char filename_idx;
-        unsigned char column;
-        unsigned short line;
-        unsigned short caller_idx;
-        unsigned short callee_idx;
-    };
-    static struct c2_trace_t c2_trace_data[] = {
-    ```);
+    out.add("c2_trace_t c2_trace_data[] = {\n");
     for (u32 i = 0; i < gen.calls.count; i++) {
         out.print("    { 0, %d, %d, %d, %d, %d },\n",
                   gen.calls.array[i].filename_idx, gen.calls.array[i].column, gen.calls.array[i].line,
                   gen.calls.array[i].caller_idx, gen.calls.array[i].callee_idx);
     }
+    out.add("};\n\n");
 
-    out.add(
-    ```c
-    };
-
-    static const unsigned c2_trace_length = sizeof(c2_trace_data) / sizeof(c2_trace_data[0]);
-    unsigned c2_trace_counts[sizeof(c2_trace_data) / sizeof(c2_trace_data[0])];
-
-    char *getenv(const char *);
-    int dprintf(int fd, const char *format, ...);
-    int strcmp(const char *s1, const char *s2);
-    typedef unsigned long size_t;
-    void qsort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *));
-    int sscanf(const char *, const char *, ...);
-
-    static int c2_match_name(const char *name, const char *pattern) {
-        for (;;) {
-            char c1, c2;
-            while ((c1 = *name++) == (c2 = *pattern++)) {
-                if (!c1) return 1;
-            }
-            if (c2 == '?') {
-                if (c1) continue;
-                return 0;
-            }
-            if (c2 == '*') {
-                c2 = *pattern++;
-                if (!c2 || c2 == ',' || c2 == ';') return 1;
-                for (; c1; c1 = *name++) {
-                    if (c1 == c2 && c2_match_name(name, pattern)) return 1;
-                }
-                return 0;
-            }
-            return (!c1 && (c2 == ',' || c2 == ';'));
-        }
-    }
-
-    static int c2_match_pattern(const char *name, const char *pattern) {
-        if (!pattern || !*pattern) return 1;
-        for (const char *p = pattern; *p;) {
-            if (c2_match_name(name, p)) return 1;
-            char c;
-            while ((c = *p++) != 0 && c != ',' && c != ';') continue;
-            if (c != ',') break;
-        }
-        return 0;
-    }
-
-    static int c2_cmp_funcs(const void *a, const void *b) {
-        const struct c2_trace_t *aa = a;
-        const struct c2_trace_t *bb = b;
-        struct c2_func_t *fa = &c2_func_data[aa->callee_idx];
-        struct c2_func_t *fb = &c2_func_data[bb->callee_idx];
-        if (fa->count != fb->count) return fa->count < fb->count ? 1 : -1;
-        if (fa != fb) return strcmp(fa->funcname, fb->funcname);
-        return (aa->count < bb->count) - (aa->count > bb->count);
-    }
-
-    static int c2_cmp_calls(const void *a, const void *b) {
-        const struct c2_trace_t *aa = a;
-        const struct c2_trace_t *bb = b;
-        return (aa->count < bb->count) - (aa->count > bb->count);
-    }
-
-    void __attribute__((destructor)) c2_trace_calls(void) {
-        const char *p = getenv("C2_TRACE");
-        const char *pattern = 0;
-        const char *filename = 0;
-        const char *caller = 0;
-        if (!p || !*p) return;
-        unsigned min = 1, min2 = 1;
-        int pos = 0, mode = 3, fd = 1, indent = 2;
-        for (; *p; p += pos) {
-            for (pos = 0;;) {
-                sscanf(p, " min%*1[=]%n%u", &pos, &min);
-                if (pos) break;
-                sscanf(p, " min2%*1[=]%n%u", &pos, &min2);
-                if (pos) break;
-                sscanf(p, " indent%*1[=]%n%u", &pos, &indent);
-                if (pos) break;
-                sscanf(p, " mode%*1[=]%n%d", &pos, &mode);
-                if (pos) break;
-                sscanf(p, " fd%*1[=]%n%d", &pos, &fd);
-                if (pos) break;
-                sscanf(p, " name%*1[=]%n", &pos);
-                if (pos) { pattern = p + pos; break; }
-                sscanf(p, " filename%*1[=]%n", &pos);
-                if (pos) { filename = p + pos; break; }
-                sscanf(p, " caller%*1[=]%n", &pos);
-                if (pos) { caller = p + pos; break; }
-                sscanf(p, "%*[^;=]%*1[=]%n", &pos);
-                break;
-            }
-            if (!pos) pattern = p;
-            while (p[pos] && p[pos++] != ';') continue;
-        }
-        if (!mode) return;
-        unsigned *counts = c2_trace_counts;
-        struct c2_trace_t* data = c2_trace_data;
-        unsigned n = c2_trace_length;
-        for (unsigned i = 0; i < n; i++) {
-            struct c2_trace_t *cp = &data[i];
-            if (c2_match_pattern(c2_func_data[cp->callee_idx].funcname, pattern)
-            &&  c2_match_pattern(c2_filenames[cp->filename_idx], filename)
-            &&  c2_match_pattern(c2_func_data[cp->caller_idx].funcname, caller)) {
-                cp->count = counts[i];
-                c2_func_data[cp->callee_idx].count += counts[i];
-            }
-        }
-        if (mode == 2) {
-            qsort(data, n, sizeof(*data), c2_cmp_calls);
-            indent = 0;
-            min2 = min;
-        } else {
-            qsort(data, n, sizeof(*data), c2_cmp_funcs);
-        }
-        struct c2_func_t *last = 0;
-        int show = 0;
-        for (unsigned i = 0; i < n; i++) {
-            struct c2_trace_t *cp = &data[i];
-            struct c2_func_t *func = &c2_func_data[cp->callee_idx];
-            unsigned count1 = func->count;
-            unsigned count2 = cp->count;
-            if (count1 < min) continue;
-            if (func != last) {
-                show = mode & 2;
-                if (mode & 1) {
-                    dprintf(fd, "%.*s%s: %u call%.*s\n", show, "\n",
-                            func->funcname, count1, count1 != 1, "s");
-                }
-                last = func;
-            }
-            if (show && count2 >= min2) {
-                dprintf(fd, "%*s%s:%d:%d: %s: %u call%.*s from %s\n",
-                        indent, "",
-                        c2_filenames[cp->filename_idx], cp->line, cp->column,
-                        func->funcname, count2, count2 != 1, "s",
-                        c2_func_data[cp->caller_idx].funcname);
-            }
-        }
-    }
-    ```);
+    out.add("uint32_t c2_trace_length = sizeof(c2_trace_data) / sizeof(c2_trace_data[0]);\n"
+            "uint32_t c2_trace_counts[sizeof(c2_trace_data) / sizeof(c2_trace_data[0])];\n\n");
 }
 
 fn void Generator.writeCallExterns(Generator* gen, string_buffer.Buf* out) {
-    out.add(
-    ```c
-    extern unsigned c2_trace_counts[];
-    extern void c2_trace_calls(void);
-    extern int atexit(void (*func)(void));
-    ```);
+    out.add("extern uint32_t c2_trace_counts[];\n");
 }
diff --git a/generator/c2_trace.c2 b/generator/c2_trace.c2
diff --git a/libs/c2/c2_trace_tables.c2i b/libs/c2/c2_trace_tables.c2i
diff --git a/libs/c2/manifest.yaml b/libs/c2/manifest.yaml

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public type File struct {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public type Target struct @(opaque) {`
`103`		`- u32 name_idx; // into aux pool`
	`103`	`+ u32 name_idx; // index into auxPool`
`104`	`104`	`SrcLoc loc;`
`105`	`105`	`warning_flags.Flags warnings;`
`106`	`106`	`Kind kind;`
Original file line number	Diff line number	Diff line change
`@@ -594,8 +594,6 @@ fn bool Context.build_target(Context* c,`
`594`	`594`	`}`
`595`	`595`	`}`
`596`	`596`
`597`		`- target.addLib(c.auxPool.add("c2", 2, true), false);`
`598`		`-`
`599`	`597`	`compiler.build(c.auxPool, c.sm, c.diags, c.build_info, target, &c.comp_opts, &c.pluginHandler);`
`600`	`598`
`601`	`599`	`// TODO unload target-specific plugins?`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ fn void Generator.createMakefile(Generator* gen,`
`105`	`105`	`if (!m.isExternal() && m.isUsed()) out.print(" %s.o", m.getName());`
`106`	`106`	`}`
`107`	`107`	`if (gen.trace_calls) {`
`108`		`- out.add(" build.o");`
	`108`	`+ out.add(" c2_trace_tables.o");`
`109`	`109`	`}`
`110`	`110`	`out.newline();`
`111`	`111`	`} else {`