New Registers Constructs

.gitignore

@@ -14,4 +14,6 @@ Cargo.lock
 *.out
 .clang-format*
 .cargo
-.vscode
+.vscode
+polybench-tests/
+notes/

src/dios-egraphs/Diospyros/Makefile

@@ -2,62 +2,50 @@ ifeq ($(shell uname),Darwin)
     EXT := dylib
 	CLANG := /usr/local/opt/llvm/bin/clang
 	SETUP := bash set_up_mac.sh
-		LIB := src/lib.rs Cargo.toml .cargo/config
+	LIB := src/lib.rs Cargo.toml .cargo/config
 else
     EXT := so
 	CLANG = clang
 	SETUP := :
-		LIB := src/lib.rs Cargo.toml
+	LIB := src/lib.rs Cargo.toml
 endif
 
 .PHONY: target/debug/libllvmlib.$(EXT)
 
-run: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) $(test)
-
-run-o2: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -O2 -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) $(test)
-
-run-out: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) $(test)
-	./a.out
-
-run-out-o2: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -O2 -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) $(test)
-	./a.out
-
-run-all: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	bash run_all.sh
-
-emit: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) -emit-llvm -S -o - $(test)
-
-emit-o2: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -O2 -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) -emit-llvm -S -o - $(test)
-
-test-opt: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -emit-llvm -S -Xclang -disable-O0-optnone -o clang.ll $(test)
-	opt -S --inline --mem2reg --indvars --loop-simplify --loop-instsimplify --licm --loop-unroll --simplifycfg clang.ll -o opt.ll
-	$(CLANG) -emit-llvm -S -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) opt.ll -o finish.ll
-	opt -S --adce finish.ll -o final.ll
-
 run-opt: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
-	$(CLANG) -emit-llvm -S -Xclang -disable-O0-optnone -o clang.ll $(test)
-	opt -S -always-inline --inline --mem2reg --scev-aa -simplifycfg --flattencfg --indvars -loops -loop-rotate --loop-simplify --loop-idiom --loop-instsimplify --licm --unroll-threshold=1000000 --loop-unroll --simplifycfg --instcombine --gvn  --mem2reg --dse --adce clang.ll -o opt.ll
-	opt -S --cfl-steens-aa opt.ll -o aa.ll
-	$(CLANG) -emit-llvm -S -Xclang -load -Xclang target/debug/libllvmlib.$(EXT) aa.ll -o diospyros.ll
-	opt -S --adce --dse diospyros.ll -o dce.ll
-	$(CLANG) dce.ll
-	./a.out
-
-test: set-up-mac runt.sh runt.toml target/debug/libllvmlib.$(EXT)
-	runt
+	@$(CLANG) -target arm64-apple-macos11 -mmacosx-version-min=11.0 -emit-llvm -S -Xclang -disable-O0-optnone -o build/clang.ll $(test)
+	@opt -S -always-inline --inline --mem2reg --scev-aa -simplifycfg --flattencfg --indvars -loops -loop-rotate --loop-simplify --loop-idiom --loop-instsimplify --licm --unroll-threshold=1000000 --loop-unroll --simplifycfg --instcombine --gvn  --mem2reg --dse --adce build/clang.ll -o build/opt.ll
+	@opt -S -load=target/debug/libllvmlib.$(EXT) --basic-aa --lsmovement --dse --adce build/opt.ll -o build/aa.ll
+	@opt -S -load=target/debug/libllvmlib.$(EXT) --diospyros -opt -print=true build/aa.ll -o build/diospyros.ll
+	@opt -S --adce --dse --gvn build/diospyros.ll -o build/dce.ll
+	@$(CLANG) -target arm64-apple-macos11 -mmacosx-version-min=11.0 build/dce.ll -o build/final
+	@build/final
+
+run-slp:
+	@$(CLANG) -target arm64-apple-macos11 -mmacosx-version-min=11.0 -emit-llvm -S -Xclang -disable-O0-optnone -o build/clang.ll $(test)
+	@opt -S -always-inline --inline --mem2reg --scev-aa -simplifycfg --flattencfg --indvars -loops -loop-rotate --loop-simplify --loop-idiom --loop-instsimplify --licm --unroll-threshold=1000000 --loop-unroll --simplifycfg --instcombine --gvn  --mem2reg --dse --adce build/clang.ll -o build/opt.ll
+	@opt -S --slp-vectorizer  build/opt.ll -o build/slp.ll
+	@opt -S --adce --dse build/slp.ll -o build/dce.ll
+	@$(CLANG) -target arm64-apple-macos11 -mmacosx-version-min=11.0 -o0 build/dce.ll -o build/final
+	@build/final
+
+run-baseline:
+	@$(CLANG) -target arm64-apple-macos11 -mmacosx-version-min=11.0 -emit-llvm -S -Xclang -disable-O0-optnone -o build/clang.ll $(test)
+	@$(CLANG) -target arm64-apple-macos11 -mmacosx-version-min=11.0 -O3 -fno-vectorize -fno-tree-vectorize -fno-slp-vectorize -o build/final build/clang.ll
+	@build/final
+
+test: set-up-mac target/debug/libllvmlib.$(EXT) diospyros.cpp 
+	turnt c-tests/*.c
 
 target/debug/libllvmlib.$(EXT): $(LIB)
-	cargo build
+	@cargo build
 
 set-up-mac: 
-	$(SETUP)
- 
+	@$(SETUP)
+
 clean:
+	rm -r build/*
+
+clean-all:
 	rm -rf target
+	rm -r build/*

src/dios-egraphs/Diospyros/README.md

@@ -7,6 +7,8 @@ This directory contains an experimental [LLVM][] pass that optimizes programs us
 To get started, you will need **LLVM 11.x.x**.
 Using [Homebrew][] on macOS, for example, try `brew install llvm@11` to get the right version.
 
+You will also need Rust, for the main Diospyros library, and a version of Python3, for testing using [turnt][].
+
 Because our Rust library relies on [the `llvm-sys` crate][llvm-sys], you will need an existing installation of `llvm-config` on your `$PATH`.
 To use a Homebrew-installed LLVM, for example, you may need something like this:
 
@@ -21,47 +23,43 @@ Add a file `.cargo/config` here, in this directory, with these [contents](https:
       "-C", "link-arg=dynamic_lookup",
     ]
 
-Then, build the pass library with:
-
-    $ cargo build
+Further, add a build directory in your current directory with the command:
 
-## Run the Pass
+    $ mkdir build
 
-To build and run the [Clang][] pass on a test file, use this Makefile command:
+If you would like, you can build the pass library with:
 
-    $ make run test=llvm-tests/a.c
+    $ cargo build
 
-where `llvm-tests/a.c` is the path to any test file.
+Otherwise, running with any of the commands in the next section should also work.
 
-To build and run the Clang pass, with optimization, use the Makefile command:
+Finally, note that the code for the Diospyros pass, in directory,  `dios-egraphs`,  must be in the directory immediately above the current one you are in, for the LLVM pass to build properly.
 
-    $ make run-opt test=llvm-tests/a.c
-
-where `llvm-tests/a.c` is the path to any test file.
+## Run the Pass
 
-To build and see emitted LLVM IR code, , with optimization, use the Makefile command:
+To build and run the [Clang][] pass, with Diospyros, use the Makefile command:
 
-$ make run-opt test=llvm-tests/a.c
+    $ make run-opt test=llvm-tests/a.c
 
-where, again, `llvm-tests/a.c` is the path to any test file.
+where `llvm-tests/a.c` is the path to any test file, for insstance `c-tests/add.c`.
 
-To emit the generated LLVM IR code, either unoptimized or optimized:
+To build and run the [Clang][] pass, with Diospyros printing out the vectorization choices, use the Makefile command:
 
-    $ make emit test=llvm-tests/a.c
-    $ make emit-o2 test=llvm-tests/a.c
+    $ make print-opt test=llvm-tests/a.c
 
+To build and run the [Clang][] pass, with no usage of Diospyros, use the Makefile command:
 
-To build, run the [Clang][] pass, and the run the associated program `./a.out`, run:
+    $ make no-opt test=llvm-tests/a.c
 
-    $ make run-out test=llvm-tests/a.c
+To build and see emitted LLVM IR code, run any of the above build commands for the file you are interested in, then look in the `build` directory and open the `dce.ll` file, which is the final pre-executable IR code file.
 
 To run all the tests, run:
 
-    $ make test
+    $ turnt c-tests/*.c
 
-To run all tests and get output, run:
+Or alternately:
 
-    $ make run-all
+    $ make test
 
 To set up macOS settings, run:
 
@@ -73,19 +71,19 @@ To clean the repository of build files, run:
 
 ## Testing
 
-Test files provided in the llvm-tests/ folder can be run with [Runt][]. To install or update Runt: 
+Test files provided in the `c-tests/` folder can be run with [turnt][]. To install or update Turnt, run the command:
 
-    $ cargo install runt
+    $ pip3 install --user turnt
 
 Then, ensure that the test files produce the right output with:
 
-    $ runt
+    $ turnt c-tests/*.c
 
-You can also pass the `--diff` flag to compare your output with the `.expect` files.
+You can also pass the `--diff` flag to compare your output with the `.expect` files, and use the `--save` flag to save new `.expect` files.
 
 
 [llvm]: https://llvm.org
 [clang]: https://clang.llvm.org
 [llvm-sys]: https://crates.io/crates/llvm-sys
 [homebrew]: https://brew.sh
-[runt]: https://github.com/rachitnigam/runt
+[turnt]: https://github.com/cucapra/turnt