Adding Coreutils benchmarks into main

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM --platform=linux/amd64 ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

headers/gensym/runtime.hpp

@@ -10,6 +10,7 @@
 #include <utility>
 #include <variant>
 #include <vector>
+#include <unistd.h>
 
 namespace gensym::runtime::v1 {
 
@@ -186,6 +187,10 @@ Value int_op_3(iOP, Value, Value, Value);
 Value float_op_2(fOP, Value, Value);
 Value bv_sext(Value, std::size_t);
 Value bv_zext(Value, std::size_t);
+Value fp_toui(Value, std::size_t);
+Value fp_tosi(Value, std::size_t);
+Value ui_tofp(Value);
+Value si_tofp(Value);
 Value trunc(Value, int, int);
 Value ite(Value, Value, Value);
 Value ptr_add(Value, Value);

runtime/runtime.cpp

@@ -179,6 +179,10 @@ Value int_op_3(iOP op, Value a, Value b, Value c) { return Bridge::wrap(::int_op
 Value float_op_2(fOP op, Value lhs, Value rhs) { return Bridge::wrap(::float_op_2(static_cast<::fOP>(op), Bridge::unwrap(lhs), Bridge::unwrap(rhs))); }
 Value bv_sext(Value value, std::size_t bw) { return Bridge::wrap(::bv_sext(Bridge::unwrap(value), bw)); }
 Value bv_zext(Value value, std::size_t bw) { return Bridge::wrap(::bv_zext(Bridge::unwrap(value), bw)); }
+Value fp_toui(Value value, std::size_t bw) { return Bridge::wrap(::fp_toui(Bridge::unwrap(value), bw)); }
+Value fp_tosi(Value value, std::size_t bw) { return Bridge::wrap(::fp_tosi(Bridge::unwrap(value), bw)); }
+Value ui_tofp(Value value) { return Bridge::wrap(::ui_tofp(Bridge::unwrap(value))); }
+Value si_tofp(Value value) { return Bridge::wrap(::si_tofp(Bridge::unwrap(value))); }
 Value trunc(Value value, int from, int to) { return Bridge::wrap(::trunc(Bridge::unwrap(value), from, to)); }
 Value ite(Value condition, Value then_value, Value else_value) { return Bridge::wrap(::ite(Bridge::unwrap(condition), Bridge::unwrap(then_value), Bridge::unwrap(else_value))); }
 Value ptr_add(Value pointer, Value offset) { return Bridge::wrap(::ptr_add(Bridge::unwrap(pointer), Bridge::unwrap(offset))); }

src/main/scala/llvm/Benchmarks.scala

@@ -166,11 +166,23 @@ object TestComp {
   }
 }
 
-object Coreutils {
-  // TODO: clean this up
-  lazy val echo = parseFile("benchmarks/coreutils/echo/echo.ll")
-  lazy val echoWithLib = parseFile("benchmarks/coreutils/echo/echoStdlibString.ll")
-  lazy val trueWithLib = parseFile("benchmarks/coreutils/trueWithLib.ll")
+object CoreutilsPOSIX {
+  val prefix = "benchmarks/coreutils/gensym_posix"
+  lazy val echo = parseFile(s"$prefix/echo.ll")
+  lazy val cat = parseFile(s"$prefix/cat.ll")
+  lazy val tru = parseFile(s"$prefix/true.ll")
+  lazy val fls = parseFile(s"$prefix/false.ll")
+  lazy val base32 = parseFile(s"$prefix/base32.ll")
+  lazy val base64 = parseFile(s"$prefix/base64.ll")
+  lazy val comm = parseFile(s"$prefix/comm.ll")
+  lazy val cut = parseFile(s"$prefix/cut.ll")
+  lazy val dirname = parseFile(s"$prefix/dirname.ll")
+  lazy val expand = parseFile(s"$prefix/expand.ll")
+  lazy val fold = parseFile(s"$prefix/fold.ll")
+  lazy val join = parseFile(s"$prefix/join.ll")
+  lazy val link = parseFile(s"$prefix/link.ll")
+  lazy val paste = parseFile(s"$prefix/paste.ll")
+  lazy val pathchk = parseFile(s"$prefix/pathchk.ll")
 }
 
 object OOPSLA20Benchmarks {

src/test/scala/gensym/TestGS.scala

@@ -184,20 +184,6 @@ class TestImpCPSGS_Z3 extends TestGS {
   Global.config.symbolicUninit = false
 }
 
-/*
-class Coreutils extends TestGS {
-  import gensym.llvm.parser.Parser._
-  Global.config.enableOpt
-  val runtimeOptions = "--output-tests-cov-new  --thread=1  --search=random-path  --solver=z3   --output-ktest  --cons-indep".split(" +").toList.toSeq
-  val cases = TestCases.coreutils.map { t =>
-    t.copy(runOpt = runtimeOptions ++ t.runOpt, runCode = false)
-  }
-  testGS(new ImpCPSGS, cases)
-
-  //testGS(new ImpCPSGS, TestPrg(cat_linked, "cat_linked_posix", "@main", noMainFileOpt, "--argv=./cat.bc --sym-stdout --sym-stdin 2 --sym-arg 2", nPath(28567)++status(0)))
-}
-*/
-
 class TestLibrary extends TestGS {
   testGS(new ImpCPSGS_lib, TestPrg(linkLib, "libtest", "@main", useArgv, noOpt, nPath(1)++status(0), false))
   testGS(new ImpCPSGS_app, TestPrg(linkApp, "libapp", "@main", useArgv, "--argv=''", nPath(1)++status(0)), s"${outputDir}/libtest")
@@ -209,8 +195,12 @@ class Playground extends TestGS {
   val gs = new ImpCPSGS
   val rtOpt = "--thread=1 --solver=z3"
 
-  val cases = TestCases.coreutils.map { t =>
-    t.copy(runOpt = t.runOpt ++ Seq("--solver=z3"))
-  }
+  //val cases = CoreutilsPOSIX.coreutils
+
+  val cases = List(TestPrg(
+    CoreutilsPOSIX.echo,
+    "echo_linked_posix", "@main",  noMainFileOpt,
+    "--output-tests-cov-new --thread=1 --search=random-path --solver=z3 --output-ktest --argv=./echo.bc --sym-stdout --sym-arg 2 --sym-arg 7",
+    nPath(216136)++status(0)))
   testGS(gs, cases)
 }