Add LLVM ModulePass regression test using run-make. #31391

frewsxcv · 2016-02-03T19:28:48Z

rust-highfive · 2016-02-03T19:29:03Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

alexcrichton · 2016-02-03T19:43:53Z

src/test/run-make/llvm-module-pass/Makefile

+
+all:
+	$(CXX) $(LLVM_CXXFLAGS) -c llvm-pass.so.cc -o $(TMPDIR)/llvm-pass.o
+	$(AR) rcs $(TMPDIR)/libllvm-pass.a $(TMPDIR)/llvm-pass.o


Can this use the support in tools.mk? The all target can depend on $(call NATIVE_STATICLIB,llvm-pass) and then you can define a rule for $(TMPDIR)/llvm-pass.o which depends on llvm-pass.so.cc.

alexcrichton · 2016-02-03T19:45:31Z

This may end up being pretty difficult to get past all the platforms like MinGW and MSVC, but in principle seems fine to me!

frewsxcv · 2016-02-04T02:11:48Z

@alexcrichton Addressed your comments. I'm not super familiar with conventions for Makefiles, so please let me know if anything looks wrong

alexcrichton · 2016-02-04T02:24:09Z

src/test/run-make/llvm-module-pass/Makefile

+	$(RUSTC) main.irs
+
+$(TMPDIR)/libllvm-pass.a: $(TMPDIR)/llvm-pass.o
+	$(AR) rcs $(TMPDIR)/libllvm-pass.a $(TMPDIR)/llvm-pass.o


You should be able to omit this as NATIVE_STATICLIB above it should handle assembling this on platforms like MSVC where lib.exe is used.

/Users/coreyf/Development/rust/rust/src/test/run-make/llvm-module-pass/Makefile diff --git a/src/test/run-make/llvm-module-pass/Makefile b/src/test/run-make/llvm-module-pass/Makefile index 69e4d00..fd34bd2 100644 --- a/src/test/run-make/llvm-module-pass/Makefile +++ b/src/test/run-make/llvm-module-pass/Makefile @@ -5,7 +5,6 @@ all: $(call NATIVE_STATICLIB,llvm-pass) $(RUSTC) main.irs $(TMPDIR)/libllvm-pass.a: $(TMPDIR)/llvm-pass.o - $(AR) rcs $(TMPDIR)/libllvm-pass.a $(TMPDIR)/llvm-pass.o $(TMPDIR)/llvm-pass.o: $(CXX) $(LLVM_CXXFLAGS) -c llvm-pass.so.cc -o $(TMPDIR)/llvm-pass.o

coreyf@frewbook-pro ~/D/r/rust (test)> make check-stage2-rmake cfg: version 1.8.0-dev (6de413585 2016-02-03) cfg: build triple x86_64-apple-darwin cfg: host triples x86_64-apple-darwin cfg: target triples x86_64-apple-darwin cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE) cfg: enabling debug assertions (CFG_ENABLE_DEBUG_ASSERTIONS) cfg: enabling debuginfo (CFG_ENABLE_DEBUGINFO) cfg: host for x86_64-apple-darwin is x86_64 cfg: os for x86_64-apple-darwin is apple-darwin cfg: disabling C++ optimization (CFG_DISABLE_OPTIMIZE_CXX) cfg: have good valgrind for x86_64-apple-darwin cfg: using CC=clang (CFG_CC) cfg: using CXX=clang++ (CFG_CXX) cfg: disabling valgrind run-pass tests cfg: disabling doc build (CFG_DISABLE_DOCS) cfg: including test rules cfg: lexer tooling not available, skipping lexer test... maketest: llvm-module-pass ----- /Users/coreyf/Development/rust/rust/src/test/run-make/llvm-module-pass/ -------------------- ------ stdout --------------------------------------------- c++ -I/Users/coreyf/Development/rust/rust/src/llvm/include -I/Users/coreyf/Development/rust/rust/x86_64-apple-darwin/llvm/include -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -O3 -stdlib=libc++ -std=c++11 -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -fno-common -Wcast-qual -c llvm-pass.so.cc -o /Users/coreyf/Development/rust/rust/x86_64-apple-darwin/test/run-make/llvm-module-pass/llvm-pass.o DYLD_LIBRARY_PATH="/Users/coreyf/Development/rust/rust/x86_64-apple-darwin/test/run-make/llvm-module-pass:/Users/coreyf/Development/rust/rust/x86_64-apple-darwin/stage2/lib:/Users/coreyf/Development/rust/rust/x86_64-apple-darwin/llvm/Release+Asserts/lib:" /Users/coreyf/Development/rust/rust/x86_64-apple-darwin/stage2/bin/rustc --out-dir /Users/coreyf/Development/rust/rust/x86_64-apple-darwin/test/run-make/llvm-module-pass -L /Users/coreyf/Development/rust/rust/x86_64-apple-darwin/test/run-make/llvm-module-pass -L native=/Users/coreyf/Development/rust/rust/x86_64-apple-darwin/llvm/Release+Asserts/lib plugin.rs -C prefer-dynamic ------ stderr --------------------------------------------- error: could not find native static library `llvm-pass`, perhaps an -L flag is missing? make[1]: *** [all] Error 101 ------ --------------------------------------------- make: *** [x86_64-apple-darwin/test/run-make/llvm-module-pass-2-T-x86_64-apple-darwin-H-x86_64-apple-darwin.ok] Error 2

or maybe you meant

diff --git a/src/test/run-make/llvm-module-pass/Makefile b/src/test/run-make/llvm-module-pass/Makefile index 69e4d00..34e8664 100644 --- a/src/test/run-make/llvm-module-pass/Makefile +++ b/src/test/run-make/llvm-module-pass/Makefile @@ -4,8 +4,5 @@ all: $(call NATIVE_STATICLIB,llvm-pass) $(RUSTC) plugin.rs -C prefer-dynamic $(RUSTC) main.irs -$(TMPDIR)/libllvm-pass.a: $(TMPDIR)/llvm-pass.o - $(AR) rcs $(TMPDIR)/libllvm-pass.a $(TMPDIR)/llvm-pass.o - $(TMPDIR)/llvm-pass.o: $(CXX) $(LLVM_CXXFLAGS) -c llvm-pass.so.cc -o $(TMPDIR)/llvm-pass.o

coreyf@frewbook-pro ~/D/r/rust (test) [2]> make check-stage2-rmake cfg: version 1.8.0-dev (6de413585 2016-02-03) cfg: build triple x86_64-apple-darwin cfg: host triples x86_64-apple-darwin cfg: target triples x86_64-apple-darwin cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE) cfg: enabling debug assertions (CFG_ENABLE_DEBUG_ASSERTIONS) cfg: enabling debuginfo (CFG_ENABLE_DEBUGINFO) cfg: host for x86_64-apple-darwin is x86_64 cfg: os for x86_64-apple-darwin is apple-darwin cfg: disabling C++ optimization (CFG_DISABLE_OPTIMIZE_CXX) cfg: have good valgrind for x86_64-apple-darwin cfg: using CC=clang (CFG_CC) cfg: using CXX=clang++ (CFG_CXX) cfg: disabling valgrind run-pass tests cfg: disabling doc build (CFG_DISABLE_DOCS) cfg: including test rules cfg: lexer tooling not available, skipping lexer test... maketest: llvm-module-pass ----- /Users/coreyf/Development/rust/rust/src/test/run-make/llvm-module-pass/ -------------------- ------ stdout --------------------------------------------- ------ stderr --------------------------------------------- make[1]: *** No rule to make target `/Users/coreyf/Development/rust/rust/x86_64-apple-darwin/test/run-make/llvm-module-pass/libllvm-pass.a', needed by `all'. Stop. ------ --------------------------------------------- make: *** [x86_64-apple-darwin/test/run-make/llvm-module-pass-2-T-x86_64-apple-darwin-H-x86_64-apple-darwin.ok] Error 2

frewsxcv · 2016-02-04T15:53:04Z

Comments have been addressed

alexcrichton · 2016-02-04T16:50:56Z

@bors: r+ ffcba80

Let's see what the windows bots have to say!

Part of rust-lang#31185

mitaa · 2016-02-05T07:11:31Z

#31421

----- /c/bot/slave/auto-win-gnu-64-opt/build/src/test/run-make/llvm-module-pass/ --------------------
------ stdout ---------------------------------------------
make[1]: Entering directory '/c/bot/slave/auto-win-gnu-64-opt/build/src/test/run-make/llvm-module-pass'
g++ -IC:\bot\slave\auto-win-gnu-64-opt\build\obj\x86_64-pc-windows-gnu\llvm\Release/include  -DNDEBUG -D__NO_CTYPE_INLINE -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -O2 -fomit-frame-pointer -std=gnu++11 -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Wcast-qual -c llvm-pass.so.cc -o /c/bot/slave/auto-win-gnu-64-opt/build/obj/x86_64-pc-windows-gnu/test/run-make/llvm-module-pass/libllvm-pass.o
Makefile:8: recipe for target '/c/bot/slave/auto-win-gnu-64-opt/build/obj/x86_64-pc-windows-gnu/test/run-make/llvm-module-pass/libllvm-pass.o' failed
make[1]: Leaving directory '/c/bot/slave/auto-win-gnu-64-opt/build/src/test/run-make/llvm-module-pass'

------ stderr ---------------------------------------------
llvm-pass.so.cc:15:28: fatal error: llvm/IR/Module.h: No such file or directory
 #include "llvm/IR/Module.h"
                            ^
compilation terminated.
make[1]: *** [/c/bot/slave/auto-win-gnu-64-opt/build/obj/x86_64-pc-windows-gnu/test/run-make/llvm-module-pass/libllvm-pass.o] Error 1

------        ---------------------------------------------

/c/bot/slave/auto-win-gnu-64-opt/build/mk/tests.mk:1064: recipe for target 'x86_64-pc-windows-gnu/test/run-make/llvm-module-pass-2-T-x86_64-pc-windows-gnu-H-x86_64-pc-windows-gnu.ok' failed
Zombie process: "\Device\HarddiskVolume1\dojob.exe"
make: *** [x86_64-pc-windows-gnu/test/run-make/llvm-module-pass-2-T-x86_64-pc-windows-gnu-H-x86_64-pc-windows-gnu.ok] Error 2
program finished with exit code 2
elapsedTime=655.183000

bors · 2016-02-05T15:05:13Z

⌛ Testing commit ffcba80 with merge 70bf97f...

nagisa · 2016-02-05T15:09:42Z

@bors r-

(requested by the author)

frewsxcv · 2016-02-05T15:11:38Z

Should all the builders have LLVM headers set up?

bors · 2016-02-05T15:11:44Z

⛄ The build was interrupted to prioritize another pull request.

alexcrichton · 2016-02-05T17:16:10Z

Yeah all the builders should have LLVM set up correctly, but this is likely due to Windows paths and MSYS shell escaping, it looks like one of the arguments is:

-IC:\bot\slave\auto-win-gnu-64-opt\build\obj\x86_64-pc-windows-gnu\llvm\Release/include

But all those back slashes are interpreted as escapes, so I think it's actually looking for the path:

-IC:botslaveauto-win-gnu-64-optbuildobjx86_64-pc-windows-gnullvmRelease/include

Which of course doesn't exist, hence the error :(

frewsxcv · 2016-02-05T17:54:34Z

@alexcrichton Do you have any suggestions on potential next steps for fixing that? I'm really not that familiar with linkers on Windows, let along linking in general

alexcrichton · 2016-02-05T18:24:05Z

Unfortunately I don't really know of a great way to deal with this. Nothing is fundamentally different on Windows, really, it's just that shell-on-windows doesn't work very well unless you're 100% staying within that shell (but we're taking input from the outside)

For now since this is just a regression test, and I expect this to behavior pretty uniformly across platforms, let's just ignore this test on Windows?

frewsxcv · 2016-02-05T20:03:30Z

Is there some special way of ignoring platforms for a test case without a cargo feature flag?

nagisa · 2016-02-05T20:05:16Z

// ignore-windows <comment>

somewhere around the top of the test. (though that might not work for maketests?)

alexcrichton · 2016-02-05T20:36:43Z

Ah unfortunately that doesn't work for run-make tests, you'll have to do something like this in the makefile:

ifdef IS_WINDOWS
all:
else
all:
    ...
endif

bors · 2016-02-06T13:16:02Z

💔 Test failed - auto-mac-32-opt

frewsxcv · 2016-02-06T17:12:20Z

So anyone have any ideas why this fails on OSX 32 bit? Intermittent? I'm running OSX 64 bit and just confirmed this test passes for me

alexcrichton · 2016-02-06T20:52:08Z

That error looks like something-or-other failed to have the plugin to load on OSX, it may be a 32/64 issue, but it doesn't look spurious

frewsxcv · 2016-02-07T19:08:54Z

I unfortunately don't have too much time right now to look into the 32 bit issue. Is it possible to just enable this test to run on 64 bit machines?

alexcrichton · 2016-02-13T01:09:45Z

Ok, debugged a bit, looks like you just need to pass in the normal CFLAGS as well. The -m32 flag isn't getting passed, so it's not linking because it's not compiled for the right architecture.

frewsxcv · 2016-02-13T17:35:18Z

Force pushed with the flag and rebased.

Change I made:

diff --git a/src/test/run-make/llvm-module-pass/Makefile b/src/test/run-make/llvm-module-pass/Makefile
index 339dd1c..0f457e7 100644
--- a/src/test/run-make/llvm-module-pass/Makefile
+++ b/src/test/run-make/llvm-module-pass/Makefile
@@ -10,5 +10,5 @@ all: $(call NATIVE_STATICLIB,llvm-pass)
    $(RUSTC) main.rs

 $(TMPDIR)/libllvm-pass.o:
-   $(CXX) $(LLVM_CXXFLAGS) -c llvm-pass.so.cc -o $(TMPDIR)/libllvm-pass.o
+   $(CXX) $(LLVM_CFLAGS) $(LLVM_CXXFLAGS) -c llvm-pass.so.cc -o $(TMPDIR)/libllvm-pass.o
 endif

frewsxcv · 2016-02-13T17:36:54Z

Also, thanks a ton for debugging the issue for me :)

alexcrichton · 2016-02-13T19:02:49Z

Hm, I'm not sure that LLVM_CFLAGS is the variable that makes its way all the way over to run-make? It looks like it's set as part of configure but not exported all the way through (or did you test this?)

It looks like we pass CFG_GCCISH_CFLAGS_$(3) to the maketest.py script which I think could just take that to shove in $(CFLAGS) and this could use that?

frewsxcv · 2016-02-13T20:30:48Z

Updated to use CFLAGS

alexcrichton · 2016-02-13T21:34:45Z

I think you'll also need to set CFLAGS in the maketest.py script as right now sys.argv[6] is just lumped into the CC variable but otherwise isn't exposed

frewsxcv · 2016-02-13T23:17:39Z

Sorry! Not too familiar with the test+build process here. Let me know how that looks

Part of rust-lang#31185

alexcrichton · 2016-02-14T07:25:38Z

@bors: r+ e5e2cdb

bors · 2016-02-14T08:25:40Z

⌛ Testing commit e5e2cdb with merge 86e6e32...

Part of #31185

bors · 2016-02-14T10:10:49Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

Part of rust-lang#31185. Similar to rust-lang#31391.

…est, r=alexcrichton Part of rust-lang#31185. Similar to rust-lang#31391.

…crichton Part of #31185. Similar to #31391.

rust-highfive assigned alexcrichton Feb 3, 2016

frewsxcv changed the title ~~Add LLVM ModulePass regression test using via run-make.~~ Add LLVM ModulePass regression test using run-make. Feb 3, 2016

frewsxcv force-pushed the test branch from 30f3d8e to b31b6e2 Compare February 3, 2016 19:29

alexcrichton reviewed Feb 3, 2016
View reviewed changes

frewsxcv force-pushed the test branch from b31b6e2 to 6de4135 Compare February 4, 2016 02:10

alexcrichton reviewed Feb 4, 2016
View reviewed changes

frewsxcv force-pushed the test branch from 6de4135 to ffcba80 Compare February 4, 2016 15:52

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 5, 2016

Rollup merge of rust-lang#31391 - frewsxcv:test, r=alexcrichton

c5b3590

Part of rust-lang#31185

Manishearth mentioned this pull request Feb 5, 2016

Rollup of 6 pull requests #31421

Closed

frewsxcv force-pushed the test branch from ffcba80 to ac74177 Compare February 5, 2016 22:05

frewsxcv force-pushed the test branch from 0c3b444 to d8a1564 Compare February 13, 2016 17:32

frewsxcv force-pushed the test branch from d8a1564 to 6a009db Compare February 13, 2016 20:30

frewsxcv force-pushed the test branch from 6a009db to ffd91c1 Compare February 13, 2016 23:17

Add LLVM ModulePass regression test using run-make.

e5e2cdb

Part of rust-lang#31185

frewsxcv force-pushed the test branch from ffd91c1 to e5e2cdb Compare February 14, 2016 03:04

bors added a commit that referenced this pull request Feb 14, 2016

Auto merge of #31391 - frewsxcv:test, r=alexcrichton

86e6e32

Part of #31185

bors merged commit e5e2cdb into rust-lang:master Feb 14, 2016

frewsxcv mentioned this pull request Feb 15, 2016

Add LLVM FunctionPass regression test using run-make. #31669

Merged

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 15, 2016

Add LLVM FunctionPass regression test using run-make.

a60ec05

Part of rust-lang#31185. Similar to rust-lang#31391.

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 15, 2016

Rollup merge of rust-lang#31669 - frewsxcv:llvm-function-pass-rmake-t…

4e50134

…est, r=alexcrichton Part of rust-lang#31185. Similar to rust-lang#31391.

bors added a commit that referenced this pull request Feb 16, 2016

Auto merge of #31669 - frewsxcv:llvm-function-pass-rmake-test, r=alex…

0bf6394

…crichton Part of #31185. Similar to #31391.

frewsxcv mentioned this pull request Feb 16, 2016

Add LLVM function pass test and LLVM module pass test #31185

Closed

frewsxcv deleted the test branch October 2, 2016 23:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add LLVM ModulePass regression test using run-make. #31391

Add LLVM ModulePass regression test using run-make. #31391

frewsxcv commented Feb 3, 2016

rust-highfive commented Feb 3, 2016

alexcrichton Feb 3, 2016

alexcrichton commented Feb 3, 2016

frewsxcv commented Feb 4, 2016

alexcrichton Feb 4, 2016

frewsxcv Feb 4, 2016

frewsxcv commented Feb 4, 2016

alexcrichton commented Feb 4, 2016

mitaa commented Feb 5, 2016

bors commented Feb 5, 2016

nagisa commented Feb 5, 2016

frewsxcv commented Feb 5, 2016

bors commented Feb 5, 2016

alexcrichton commented Feb 5, 2016

frewsxcv commented Feb 5, 2016

alexcrichton commented Feb 5, 2016

frewsxcv commented Feb 5, 2016

nagisa commented Feb 5, 2016

alexcrichton commented Feb 5, 2016

bors commented Feb 6, 2016

frewsxcv commented Feb 6, 2016

alexcrichton commented Feb 6, 2016

frewsxcv commented Feb 7, 2016

alexcrichton commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

alexcrichton commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

alexcrichton commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

alexcrichton commented Feb 14, 2016

bors commented Feb 14, 2016

bors commented Feb 14, 2016

Add LLVM ModulePass regression test using run-make. #31391

Add LLVM ModulePass regression test using run-make. #31391

Conversation

frewsxcv commented Feb 3, 2016

rust-highfive commented Feb 3, 2016

alexcrichton Feb 3, 2016

Choose a reason for hiding this comment

alexcrichton commented Feb 3, 2016

frewsxcv commented Feb 4, 2016

alexcrichton Feb 4, 2016

Choose a reason for hiding this comment

frewsxcv Feb 4, 2016

Choose a reason for hiding this comment

frewsxcv commented Feb 4, 2016

alexcrichton commented Feb 4, 2016

mitaa commented Feb 5, 2016

bors commented Feb 5, 2016

nagisa commented Feb 5, 2016

frewsxcv commented Feb 5, 2016

bors commented Feb 5, 2016

alexcrichton commented Feb 5, 2016

frewsxcv commented Feb 5, 2016

alexcrichton commented Feb 5, 2016

frewsxcv commented Feb 5, 2016

nagisa commented Feb 5, 2016

alexcrichton commented Feb 5, 2016

bors commented Feb 6, 2016

frewsxcv commented Feb 6, 2016

alexcrichton commented Feb 6, 2016

frewsxcv commented Feb 7, 2016

alexcrichton commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

alexcrichton commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

alexcrichton commented Feb 13, 2016

frewsxcv commented Feb 13, 2016

alexcrichton commented Feb 14, 2016

bors commented Feb 14, 2016

bors commented Feb 14, 2016