attempt to fix ubuntu build; normalise spaced LLVM array type syntax (#472)

* attempt to fix ubuntu build; normalie spaced LLVM array type syntax

* clean CConfig

* one more lpvm section name

* normalise tmp dir in complex tests

* normalise more paths

* add path to complx-test call; fix type on signum

* derive path in python

Author: jimbxb

Makefile

@@ -124,4 +124,4 @@ test:	wybemk
 
 clean:
 	stack clean
-	rm -f $(SRCDIR)/*.o $(SRCDIR)/*.hi $(SRCDIR)/Version.lhs documentation/*.pdf publications/*.pdf $(LIBDIR)/*.o $(LIBDIR)/wybe/*.o test-cases/*.o
+	rm -f $(SRCDIR)/*.o $(SRCDIR)/*.hi $(SRCDIR)/Version.lhs $(SRCDIR)/CConfig.hs documentation/*.pdf publications/*.pdf $(LIBDIR)/*.o $(LIBDIR)/wybe/*.o test-cases/*.o

src/Config.hs

@@ -199,10 +199,7 @@ llvmToObjectCommand llFile oFile options =
 -- | The section name of the LPVM object file section.  This includes the
 -- segment name, as well, and the format varies depending on object file format.
 lpvmSectionName :: String
-lpvmSectionName = case buildOS of
-    OSX   -> "__LPVM,__lpvm"
-    Linux -> "__LPVM.__lpvm"
-    os    -> error $ "Unsupported OS: " ++ show os
+lpvmSectionName = "__LPVM,__lpvm"
 
 
 -- | Remove the lpvm section from the given file. It's only effective on Linux,
@@ -212,7 +209,7 @@ removeLPVMSection target =
     case buildOS of
         OSX   -> return $ Right ()
         Linux -> do
-            let args = ["--remove-section", "__LPVM.__lpvm", target]
+            let args = ["--remove-section", lpvmSectionName, target]
             (exCode, _, serr) <-
                     readCreateProcessWithExitCode (proc "objcopy" args) ""
             case exCode of

src/Emit.hs

@@ -241,7 +241,8 @@ makeExec :: [FilePath]          -- Object Files
 makeExec ofiles target = do
     let options = "-no-pie" : Config.linkerDeadStripArgs
     -- let options = linkerDeadStripArgs
-    let args = options ++ ofiles ++ ["-o", target]
+    let args = List.filter (not . List.null) 
+             $ options ++ ofiles ++ ["-o", target]
     logEmit $ "Generating final executable with command line: cc "
               ++ unwords args
     (exCode, _, serr) <- liftIO $

src/LLVM.hs

@@ -1012,7 +1012,7 @@ writeAssemblyExports = do
     m <- llvmGetModule modSpec
     modBS <- lift $ List.map BI.w2c . BL.unpack <$> encodeModule m
     let constName = "##MODULE:" ++ showModSpec m
-    declareStringConstant constName modBS $ Just "__LPVM,__lpvm"
+    declareStringConstant constName modBS $ Just lpvmSectionName
 
 
 -- | Emit an LLVM declaration for a string constant, optionally specifying a

src/ObjectInterface.hs

@@ -10,6 +10,7 @@ module ObjectInterface (extractLPVMData, getWrappedBitcode) where
 import           AST
 import Options (LogSelection(Builder))
 import           BinaryFactory
+import           Config (lpvmSectionName)
 import           Control.Monad
 import           Data.Binary
 import           Data.Binary.Get
@@ -71,7 +72,7 @@ extractLPVMDataLinux tmpDir objFile = do
     let lpvmFile = tmpDir </> modFile
     -- [objcopy] tries to write to the file even we only need read permission.
     -- We force it to write to /dev/null so it's "read-only".
-    let args = ["--dump-section", "__LPVM.__lpvm=" ++ lpvmFile] ++ [objFile]
+    let args = ["--dump-section", lpvmSectionName ++ "=" ++ lpvmFile] ++ [objFile]
                ++ ["/dev/null"]
     (exCode, _, serr) <- readCreateProcessWithExitCode (proc "objcopy" args) ""
     case exCode of

test-cases/complex-test.py

@@ -24,7 +24,7 @@ def main() -> None:
         exp_file_path = "./complex/exp/{}.exp".format(test_name)
         with open(out_file_path, "w") as out_file:
             with tempfile.TemporaryDirectory() as tmp_dir:
-                ctx = utils.Context(tmp_dir, out_file)
+                ctx = utils.Context(tmp_dir, os.path.dirname(root_path), out_file)
                 # execute test case
                 try:
                     test_func(ctx)
@@ -40,8 +40,10 @@ def main() -> None:
             # the behavior of other scripts. We should consider using
             # things like "filecmp.cmp" for portability and efficiency.
             code = subprocess.run(
-                ["diff", "-q", "-I", "^source_filename =.*",
-                    "-I", "^target triple", out_file_path, exp_file_path],
+                ["diff", "-q", 
+                    "-I", "^source_filename *=.*",
+                    "-I", "^target triple *=.*", 
+                    out_file_path, exp_file_path],
                 stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode
             if code == 0:
                 print(".", end="")

test-cases/complex/exp/testcase_multi_specz-drone.exp

@@ -624,10 +624,10 @@ module top-level code > {terminal,inline,impure} (0 calls)
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = '*main* module'
 
-source_filename = "/private/var/folders/3j/sg3vq95525xcslr4qb7n2krm0000gn/T/tmpsxa5z4xs/drone"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!TMP!/drone"
+target triple   = ???
 
-@"cstring#0" = private unnamed_addr constant [ 1 x i8 ] c"\00", align 8
+@"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"\00", align 8
 
 declare external fastcc void @"command_line.<0>"()
 declare external fastcc void @"drone.<0>"()
@@ -709,11 +709,11 @@ set_exit_code(code##0:wybe.int)<{}; {<<command_line.exit_code>>}; {}>:
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = 'command_line'
 
-source_filename = "/Users/schachte/research/mine/wybe/wybelibs/command_line.o"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!ROOT!/wybelibs/command_line.o"
+target triple   = ???
 
-@"cstring#0" = private unnamed_addr constant [ 34 x i8 ] c"Erroneous program argument vector\00", align 8
-@"cstring#1" = private unnamed_addr constant [ 19 x i8 ] c"command_line:18:15\00", align 8
+@"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Erroneous program argument vector\00", align 8
+@"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"command_line:18:15\00", align 8
 
 declare external fastcc {i64, i64, i1} @"wybe.array.[|]<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
@@ -1148,14 +1148,14 @@ print_info(d##0:drone.drone_info)<{<<wybe.io.io>>}; {<<wybe.io.io>>}; {}>:
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = 'drone'
 
-source_filename = "/private/var/folders/3j/sg3vq95525xcslr4qb7n2krm0000gn/T/tmpsxa5z4xs/drone.wybe"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!TMP!/drone.wybe"
+target triple   = ???
 
-@"cstring#0" = private unnamed_addr constant [ 2 x i8 ] c"(\00", align 8
-@"cstring#1" = private unnamed_addr constant [ 4 x i8 ] c") #\00", align 8
-@"cstring#2" = private unnamed_addr constant [ 18 x i8 ] c"** malloc count: \00", align 8
-@"cstring#3" = private unnamed_addr constant [ 3 x i8 ] c", \00", align 8
-@"cstring#4" = private unnamed_addr constant [ 16 x i8 ] c"invalid action!\00", align 8
+@"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"(\00", align 8
+@"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c") #\00", align 8
+@"cstring#2" = private unnamed_addr constant [ ?? x i8 ] c"** malloc count: \00", align 8
+@"cstring#3" = private unnamed_addr constant [ ?? x i8 ] c", \00", align 8
+@"cstring#4" = private unnamed_addr constant [ ?? x i8 ] c"invalid action!\00", align 8
 @"string#5" = private unnamed_addr constant {i64, i64} { i64 1, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#6" = private unnamed_addr constant {i64, i64} { i64 3, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#7" = private unnamed_addr constant {i64, i64} { i64 17, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8
@@ -1783,8 +1783,8 @@ proc ~= > public {inline} (0 calls)
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = 'drone.drone_info'
 
-source_filename = "/private/var/folders/3j/sg3vq95525xcslr4qb7n2krm0000gn/T/tmpsxa5z4xs/drone.wybe"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!TMP!/drone.wybe"
+target triple   = ???
 
 
 declare external ccc ptr @wybe_malloc(i32)

test-cases/complex/exp/testcase_multi_specz-int_list.exp

@@ -985,10 +985,10 @@ module top-level code > {terminal,inline,impure} (0 calls)
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = '*main* module'
 
-source_filename = "/private/var/folders/3j/sg3vq95525xcslr4qb7n2krm0000gn/T/tmpegv4tlyf/int_list_test"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!TMP!/int_list_test"
+target triple   = ???
 
-@"cstring#0" = private unnamed_addr constant [ 1 x i8 ] c"\00", align 8
+@"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"\00", align 8
 
 declare external fastcc void @"command_line.<0>"()
 declare external fastcc void @"int_list_test.<0>"()
@@ -1070,11 +1070,11 @@ set_exit_code(code##0:wybe.int)<{}; {<<command_line.exit_code>>}; {}>:
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = 'command_line'
 
-source_filename = "/Users/schachte/research/mine/wybe/wybelibs/command_line.o"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!ROOT!/wybelibs/command_line.o"
+target triple   = ???
 
-@"cstring#0" = private unnamed_addr constant [ 34 x i8 ] c"Erroneous program argument vector\00", align 8
-@"cstring#1" = private unnamed_addr constant [ 19 x i8 ] c"command_line:18:15\00", align 8
+@"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c"Erroneous program argument vector\00", align 8
+@"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c"command_line:18:15\00", align 8
 
 declare external fastcc {i64, i64, i1} @"wybe.array.[|]<0>"(i64)
 declare external ccc void @error_exit(i64, i64)
@@ -1646,8 +1646,8 @@ sort(lst##0:int_list.int_list, ?#result##0:int_list.int_list)<{}; {}; {}>:
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = 'int_list'
 
-source_filename = "/private/var/folders/3j/sg3vq95525xcslr4qb7n2krm0000gn/T/tmpegv4tlyf/int_list.wybe"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!TMP!/int_list.wybe"
+target triple   = ???
 
 
 declare external ccc void @print_int(i64)
@@ -2382,8 +2382,8 @@ proc ~= > public {inline} (0 calls)
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = 'int_list.int_list'
 
-source_filename = "/private/var/folders/3j/sg3vq95525xcslr4qb7n2krm0000gn/T/tmpegv4tlyf/int_list.wybe"
-target triple   = "arm64-apple-darwin23.6.0"
+source_filename = "!TMP!/int_list.wybe"
+target triple   = ???
 
 
 declare external ccc ptr @wybe_malloc(i32)
@@ -2747,18 +2747,18 @@ test_int_list(x##0:int_list.int_list, y##0:int_list.int_list, z##0:int_list.int_
 ;; FILE GENERATED BY wybemk 0.2 -- see https://github.com/pschachte/wybe
 ; ModuleID = 'int_list_test'
 
-source_filename = "/private/var/folders/3j/sg3vq95525xcslr4qb7n2krm0000gn/T/tmpegv4tlyf/int_list_test.wybe"
-target triple   = "arm64-apple-darwin23.6.0"
-
-@"cstring#0" = private unnamed_addr constant [ 37 x i8 ] c" ** malloc count of building lists: \00", align 8
-@"cstring#1" = private unnamed_addr constant [ 36 x i8 ] c" ** malloc count of test(aliased): \00", align 8
-@"cstring#2" = private unnamed_addr constant [ 40 x i8 ] c" ** malloc count of test(non-aliased): \00", align 8
-@"cstring#3" = private unnamed_addr constant [ 2 x i8 ] c"-\00", align 8
-@"cstring#4" = private unnamed_addr constant [ 21 x i8 ] c"--------------------\00", align 8
-@"cstring#5" = private unnamed_addr constant [ 16 x i8 ] c"original x y z:\00", align 8
-@"cstring#6" = private unnamed_addr constant [ 17 x i8 ] c"tests with alias\00", align 8
-@"cstring#7" = private unnamed_addr constant [ 20 x i8 ] c"tests without alias\00", align 8
-@"cstring#8" = private unnamed_addr constant [ 7 x i8 ] c"x y z:\00", align 8
+source_filename = "!TMP!/int_list_test.wybe"
+target triple   = ???
+
+@"cstring#0" = private unnamed_addr constant [ ?? x i8 ] c" ** malloc count of building lists: \00", align 8
+@"cstring#1" = private unnamed_addr constant [ ?? x i8 ] c" ** malloc count of test(aliased): \00", align 8
+@"cstring#2" = private unnamed_addr constant [ ?? x i8 ] c" ** malloc count of test(non-aliased): \00", align 8
+@"cstring#3" = private unnamed_addr constant [ ?? x i8 ] c"-\00", align 8
+@"cstring#4" = private unnamed_addr constant [ ?? x i8 ] c"--------------------\00", align 8
+@"cstring#5" = private unnamed_addr constant [ ?? x i8 ] c"original x y z:\00", align 8
+@"cstring#6" = private unnamed_addr constant [ ?? x i8 ] c"tests with alias\00", align 8
+@"cstring#7" = private unnamed_addr constant [ ?? x i8 ] c"tests without alias\00", align 8
+@"cstring#8" = private unnamed_addr constant [ ?? x i8 ] c"x y z:\00", align 8
 @"string#9" = private unnamed_addr constant {i64, i64} { i64 36, i64 ptrtoint( ptr @"cstring#0" to i64 ) }, align 8
 @"string#10" = private unnamed_addr constant {i64, i64} { i64 35, i64 ptrtoint( ptr @"cstring#1" to i64 ) }, align 8
 @"string#11" = private unnamed_addr constant {i64, i64} { i64 39, i64 ptrtoint( ptr @"cstring#2" to i64 ) }, align 8

test-cases/complex/utils.py

@@ -16,15 +16,11 @@ def test_case(func) -> None:
     TEST_CASES.append((func.__name__, filename, func))
     return func
 
-def normalise(output: str) -> str:
-    output = re.sub(r"@([A-Za-z_]\w*):[0-9:]*", r"@\1:nn:nn", output)
-    output = re.sub(r"\[[0-9][0-9]* x i8\]", "[?? x i8]", output)
-    return output
-
 
 class Context:
-    def __init__(self, tmp_dir: str, out_file: TextIOWrapper) -> None:
+    def __init__(self, tmp_dir: str, root_dir: str, out_file: TextIOWrapper) -> None:
         self.tmp_dir = tmp_dir
+        self.root_dir = root_dir
         self.out_file = out_file
         self.files_hash = defaultdict(str)
 
@@ -105,7 +101,15 @@ def wybe_build_target(self, target: str, force_all: bool, final_dump: bool,
                 self.write_section("ERROR OUTPUT", r.stdout.decode("utf-8"))
                 r.check_returncode()
 
-        return (r.returncode, normalise(r.stdout.decode("utf-8")))
+        return (r.returncode, self.normalise(r.stdout.decode("utf-8")))
+    
+    def normalise(self, output: str) -> str:
+        output = re.sub(r"@([A-Za-z_]\w*):[0-9:]*", r"@\1:nn:nn", output)
+        output = re.sub(r"\[ [0-9][0-9]* x i8 \]", "[ ?? x i8 ]", output)
+        output = re.sub(r"(target triple *= *).*", r"\1???", output)
+        output = output.replace(self.tmp_dir, "!TMP!")
+        output = output.replace(self.root_dir, "!ROOT!")
+        return output
 
     def execute_program(self, exe: str, check: bool,
             input: Optional[str] = None,

test-cases/final-dump-test.sh

@@ -22,7 +22,7 @@ do
 	$TIMEOUT ../wybemk --log=FinalDump --force-all -L $LIBDIR $targ 2>&1 \
 	    | sed -e 's/@\([A-Za-z0-9_]*\):[0-9:]*/@\1:nn:nn/g' \
             -e "s|`pwd`|!ROOT!|g" \
-            -e 's/\[[0-9][0-9]* x i8\]/[?? x i8]/g' \
+            -e 's/\[ [0-9][0-9]* x i8 \]/[ ?? x i8 ]/g' \
 			-e 's/^\(target triple *\)=.*/\1 ????/' \
         > $out
 	# Add a newline to the end of a file if there isn't to resolve platform differences.