feat(bleach): apply prefix to all lifted functions

Author: arromanoff

lib/lifter/lifter.cpp

@@ -460,12 +460,10 @@ register_stats collect_register_stats(const instr_impl &instr, Module &m,
     throw std::runtime_error(
         "register-classes were not specified in input YAML");
   register_stats stats(rclasses.begin(), rclasses.end());
-  const MCRegisterInfo *rinfo = nullptr;
   auto *stinfo = mmi.getTarget().getSubtargetImpl(*m.begin());
   for (auto &f : m) {
     auto &mf = mmi.getOrCreateMachineFunction(f);
     collect_register_stats_for(mf, mmi.getTarget(), stats);
-    rinfo = stinfo->getRegisterInfo();
   }
   assert(!m.empty());
   assert(stinfo);
@@ -1180,24 +1178,8 @@ Module &bleach_module(Module &m, MachineModuleInfo &mmi,
 
   create_bleach_symtab_add_function_decl(m);
   create_bleach_symtab_lookup_function_decl(m);
-  // rename "main" function
-  auto *main_func = m.getFunction("main");
-  if (main_func)
-    main_func->setName(std::format("{}main", lifted_prefix));
-  // create state struct and generate header
-  auto &state = create_state_type(m.getContext(), reg_stats, stack_size);
-  if (!state_struct_file.empty()) {
-    if (state_struct_file == "-") {
-      print_state_header(std::cout, translated, state, reg_stats);
-    } else {
-      std::fstream fs(std::string(state_struct_file), std::fstream::out);
-      if (!fs.is_open())
-        throw std::runtime_error(
-            std::format("Could not open file \"{}\"", state_struct_file));
-      print_state_header(fs, translated, state, reg_stats);
-    }
-  }
 
+  auto &state = create_state_type(m.getContext(), reg_stats, stack_size);
   for (auto &&[oldf, func_info] : funcs)
     generate_function(*oldf, func_info, instrs, mmi, state, reg_stats,
                       assume_functions_nop);
@@ -1219,6 +1201,21 @@ Module &bleach_module(Module &m, MachineModuleInfo &mmi,
     }
     Linker::linkModules(m, std::move(extra));
   }
+  // rename functions
+  for (auto *func : translated)
+    func->setName(std::format("{}{}", lifted_prefix, func->getName().data()));
+  // create state struct and generate header
+  if (!state_struct_file.empty()) {
+    if (state_struct_file == "-") {
+      print_state_header(std::cout, translated, state, reg_stats);
+    } else {
+      std::fstream fs(std::string(state_struct_file), std::fstream::out);
+      if (!fs.is_open())
+        throw std::runtime_error(
+            std::format("Could not open file \"{}\"", state_struct_file));
+      print_state_header(fs, translated, state, reg_stats);
+    }
+  }
   for (auto *f : target_functions)
     f->eraseFromParent();
 

test/integration/doubles-mixed.c

@@ -1,15 +1,12 @@
 // RUN: %config-gen-path/config-gen.rb --march rv64imfd \
 // RUN:   --template-dir %config-gen-path/templates -o %t.yaml
-// RUN: riscv64-unknown-linux-gnu-clang %s -O2 -c -o %t.out -march=rv64imfd
+// RUN: riscv64-unknown-linux-gnu-clang %s -O2 -c -o %t.out -march=rv64imfd \
+// RUN:   -I %S/inputs
 // RUN: %bin/llvm-bleach %t.out --instructions %t.yaml -o %t.ll \
-// RUN:   --state-struct-file=%t.state.h
+// RUN:   --state-struct-file=%t.state.h --lifted-prefix=bleached_
 // RUN: sed 's|STATE|%t.state.h|g' %S/inputs/doubles-mixed-main.c > %t.main.c
-// RUN: clang %t.main.c %t.ll -o %t.native.out -g -fsanitize=address,undefined
+// RUN: clang %t.main.c %t.ll -o %t.native.out -fsanitize=address,undefined \
+// RUN:   -I %S/inputs
 // RUN: %t.native.out
 
-double complex_mixed(double a, double b, double c, double d) {
-  double part1 = (a + b) * (unsigned)(c - d);
-  double part2 = (a * d) + (int)(b * c);
-  double part3 = (a / c) * (long long)(b / d);
-  return part1 + part2 - part3;
-}
+#include "doubles-mixed.h"

test/integration/indbr.s

@@ -28,8 +28,8 @@ main:
   addi a0, a0, -5
   ret
 
-# CHECK: define void @count_to_5
-# CHECK-NEXT: call void @bleach_symtab_add(i64 0, ptr @count_to_5)
+# CHECK: define void @bleached_count_to_5
+# CHECK-NEXT: call void @bleach_symtab_add(i64 0, ptr @bleached_count_to_5)
 # CHECK: [[FUNCADDR:%[0-9]+]] = call ptr @bleach_symtab_lookup
 # CHECK: musttail call void [[FUNCADDR]]
 

test/integration/inputs/doubles-mixed-main.c

@@ -1,4 +1,6 @@
+#include "doubles-mixed.h"
 #include <STATE>
+
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -17,15 +19,6 @@ double bitcast_to_double(int64_t v) {
   return res;
 }
 
-// This should be in sync with test/integration/doubles-mixed.c
-// TODO: automate this
-double reference(double a, double b, double c, double d) {
-  double part1 = (a + b) * (unsigned)(c - d);
-  double part2 = (a * d) + (int)(b * c);
-  double part3 = (a / c) * (long long)(b / d);
-  return part1 + part2 - part3;
-}
-
 int main() {
   printf("Hello from main\n");
   int arg_1 = 3;
@@ -36,8 +29,8 @@ int main() {
   regs.FPR[11] = bitcast_to_int(arg_2);
   regs.FPR[12] = bitcast_to_int(arg_3);
   regs.FPR[13] = bitcast_to_int(arg_4);
-  complex_mixed(&regs);
-  double res1 = reference(arg_1, arg_2, arg_3, arg_4);
+  bleached_complex_mixed(&regs);
+  double res1 = complex_mixed(arg_1, arg_2, arg_3, arg_4);
   double res2 = bitcast_to_double(regs.FPR[10]);
   printf("result: %lf\n", res2);
   printf("reference: %lf\n", res1);

test/integration/inputs/doubles-mixed.h

@@ -0,0 +1,8 @@
+#pragma once
+
+double complex_mixed(double a, double b, double c, double d) {
+  double part1 = (a + b) * (unsigned)(c - d);
+  double part2 = (a * d) + (int)(b * c);
+  double part3 = (a / c) * (long long)(b / d);
+  return part1 + part2 - part3;
+}

test/integration/inputs/riscv-mixed-fp.c

@@ -1,4 +1,6 @@
 #include <STATE>
+#include <riscv-mixed-fp.h>
+
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -18,18 +20,6 @@ double bitcast_to_double(int64_t v) {
   return res;
 }
 
-// This should be in sync with test/integration/riscv-mixed-fp.c
-// TODO: automate this
-double ref_calc2(double prod, double sum, int x) {
-  return prod + sum - (double)x;
-}
-
-double ref_calc1(double a, double b, int x) {
-  return ref_calc2(a * b, (a + b), x);
-}
-
-double reference(double a, double b, int x) { return ref_calc1(a, b, x); }
-
 int are_equal(double a, double b) {
   if (isnan(a) && isnan(b))
     return 1;
@@ -47,8 +37,8 @@ int main() {
   regs.FPR[10] = bitcast_to_int(arg_1);
   regs.FPR[11] = bitcast_to_int(arg_2);
   regs.GPR[10] = arg_3;
-  top_small(&regs);
-  double res1 = reference(arg_1, arg_2, arg_3);
+  bleached_top_small(&regs);
+  double res1 = top_small(arg_1, arg_2, arg_3);
   double res2 = bitcast_to_double(regs.FPR[10]);
   printf("result: %lf\n", res2);
   printf("reference: %lf\n", res1);

test/integration/inputs/riscv-mixed-fp.h

@@ -0,0 +1,7 @@
+#pragma once
+
+double calc2(double prod, double sum, int x) { return prod + sum - (double)x; }
+
+double calc1(double a, double b, int x) { return calc2(a * b, (a + b), x); }
+
+double top_small(double a, double b, int x) { return calc1(a, b, x); }

test/integration/inputs/riscv-mixed-precision-fp.c

@@ -1,4 +1,6 @@
+#include "riscv-mixed-precision-fp.h"
 #include <STATE>
+
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -18,18 +20,6 @@ double bitcast_to_double(int64_t v) {
   return res;
 }
 
-// This should be in sync with test/integration/riscv-mixed-fp.c
-// TODO: automate this
-double ref_calc2(float prod, double sum, int x) {
-  return prod + sum - (double)x;
-}
-
-double ref_calc1(float a, float b, int x) {
-  return ref_calc2(a * b, (a + b), x + a / b);
-}
-
-double reference(double a, double b, int x) { return ref_calc1(a, b, x); }
-
 int are_equal(double a, double b) {
   if (isnan(a) && isnan(b))
     return 1;
@@ -47,8 +37,8 @@ int main() {
   regs.FPR[10] = bitcast_to_int(arg_1);
   regs.FPR[11] = bitcast_to_int(arg_2);
   regs.GPR[10] = arg_3;
-  top_small(&regs);
-  double res1 = reference(arg_1, arg_2, arg_3);
+  bleached_top_small(&regs);
+  double res1 = top_small(arg_1, arg_2, arg_3);
   double res2 = bitcast_to_double(regs.FPR[10]);
   printf("result: %lf\n", res2);
   printf("reference: %lf\n", res1);

test/integration/inputs/riscv-mixed-precision-fp.h

@@ -0,0 +1,9 @@
+#pragma once
+
+double calc2(float prod, double sum, int x) { return prod + sum - (double)x; }
+
+double calc1(float a, float b, int x) {
+  return calc2(a * b, (a + b), x + a / b);
+}
+
+double top_small(double a, double b, int x) { return calc1(a, b, x); }

test/integration/riscv-mixed-fp.c

@@ -1,14 +1,12 @@
 // RUN: %config-gen-path/config-gen.rb --march rv64imfd \
 // RUN:   --template-dir %config-gen-path/templates -o %t.yaml
-// RUN: riscv64-unknown-linux-gnu-clang %s -O2 -c -o %t.out -march=rv64imfd
+// RUN: riscv64-unknown-linux-gnu-clang %s -O2 -c -o %t.out -march=rv64imfd \
+// RUN:   -I %S/inputs
 // RUN: %bin/llvm-bleach %t.out --instructions %t.yaml -o %t.ll \
-// RUN:   --state-struct-file=%t.state.h
+// RUN:   --state-struct-file=%t.state.h --lifted-prefix=bleached_
 // RUN: sed 's|STATE|%t.state.h|g' %S/inputs/riscv-mixed-fp.c > %t.main.c
-// RUN: clang %t.main.c %t.ll -o %t.native.out -g -fsanitize=address,undefined
+// RUN: clang %t.main.c %t.ll -o %t.native.out -g -fsanitize=address,undefined \
+// RUN:   -I %S/inputs
 // RUN: %t.native.out
 
-double calc2(double prod, double sum, int x) { return prod + sum - (double)x; }
-
-double calc1(double a, double b, int x) { return calc2(a * b, (a + b), x); }
-
-double top_small(double a, double b, int x) { return calc1(a, b, x); }
+#include "riscv-mixed-fp.h"