Merge pull request JuliaLang#28841 from JuliaLang/vc/utils

Add `lit` and `FileCheck` to tools and run llvmpasses by default
Liozou · Sep 1, 2018 · 8acad0c · 8acad0c
2 parents 804d12e + 455e669
commit 8acad0c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -145,6 +145,9 @@ script:
  # restore initial state and prepare for travis caching
  - mv julia2 julia &&
  rm -f julia/deps/scratch/libgit2-*/CMakeFiles/CMakeOutput.log
+ # run the LLVM tests on Linux
+ - if [ `uname` = "Linux" ]; then
+ pushd julia && make -C test/llvmpasses && popd; fi
  # run the doctests on Linux 64-bit
  - if [ `uname` = "Linux" ] && [ $ARCH = "x86_64" ]; then
  pushd julia && make -C doc doctest=true && popd; fi

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ all: debug release
 # sort is used to remove potential duplicates
 DIRS := $(sort $(build_bindir) $(build_depsbindir) $(build_libdir) $(build_private_libdir) $(build_libexecdir) $(build_includedir) $(build_includedir)/julia $(build_sysconfdir)/julia $(build_datarootdir)/julia $(build_datarootdir)/julia/stdlib $(build_man1dir))
 ifneq ($(BUILDROOT),$(JULIAHOME))
-BUILDDIRS := $(BUILDROOT) $(addprefix $(BUILDROOT)/,base src ui doc deps test test/embedding)
+BUILDDIRS := $(BUILDROOT) $(addprefix $(BUILDROOT)/,base src ui doc deps test test/embedding test/llvmpasses)
 BUILDDIRMAKE := $(addsuffix /Makefile,$(BUILDDIRS))
 DIRS := $(DIRS) $(BUILDDIRS)
 $(BUILDDIRMAKE): | $(BUILDDIRS)

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -1,5 +1,5 @@
 LLVM_VER = 6.0.1
-LLVM_BB_REL = 1
+LLVM_BB_REL = 2
 PCRE_VER = 10.30
 DSFMT_VER = 2.2.3
 LAPACK_VER = 3.5.0

diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -70,6 +70,8 @@ ifeq ($(USE_POLLY_ACC),1)
 LLVM_CMAKE += -DPOLLY_ENABLE_GPGPU_CODEGEN=ON
 endif
 LLVM_CMAKE += -DLLVM_TOOLS_INSTALL_DIR=$(shell $(JULIAHOME)/contrib/relative_path.sh $(build_prefix) $(build_depsbindir))
+LLVM_CMAKE += -DLLVM_UTILS_INSTALL_DIR=$(shell $(JULIAHOME)/contrib/relative_path.sh $(build_prefix) $(build_depsbindir))
+LLVM_CMAKE += -DLLVM_INCLUDE_UTILS=ON -DLLVM_INSTALL_UTILS=ON
 LLVM_CMAKE += -DLLVM_BINDINGS_LIST="" -DLLVM_INCLUDE_DOCS=Off -DLLVM_ENABLE_TERMINFO=Off -DHAVE_HISTEDIT_H=Off -DHAVE_LIBEDIT=Off
 ifeq ($(LLVM_ASSERTIONS), 1)
 LLVM_CMAKE += -DLLVM_ENABLE_ASSERTIONS:BOOL=ON
@@ -461,7 +463,9 @@ endif
 $(build_prefix)/manifest/llvm: | $(llvm_python_workaround)
 
 LLVM_INSTALL = \
- cd $1 && $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake
+ cd $1 && mkdir -p $2$$(build_depsbindir) && \
+ cp -r $$(LLVM_SRC_DIR)/utils/lit $2$$(build_depsbindir)/ && \
+ $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake
 ifeq ($(OS), WINNT)
 LLVM_INSTALL += && cp $2$$(build_shlibdir)/LLVM.dll $2$$(build_depsbindir)
 endif
@@ -525,7 +529,7 @@ $(BUILDDIR)/llvm-$(LLVM_VER)-$(LLVM_BB_REL)/build-compiled: | $(BUILDDIR)/llvm-$
 $(eval $(call staged-install,llvm,llvm-$$(LLVM_VER)-$$(LLVM_BB_REL),,,,))
 
 #Override provision of stage tarball
-$(build_staging)/llvm-$(LLVM_VER)-$(LLVM_BB_REL).tgz: $(BUILDDIR)/llvm-$(LLVM_VER)-$(LLVM_BB_REL)/LLVM.$(BINARYBUILDER_TRIPLET).tar.gz
+$(build_staging)/llvm-$(LLVM_VER)-$(LLVM_BB_REL).tgz: $(BUILDDIR)/llvm-$(LLVM_VER)-$(LLVM_BB_REL)/LLVM.$(BINARYBUILDER_TRIPLET).tar.gz | $(build_staging)
  cp $< $@
 
 clean-llvm:

diff --git a/test/llvmpasses/Makefile b/test/llvmpasses/Makefile
@@ -1,11 +1,6 @@
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 JULIAHOME := $(abspath $(SRCDIR)/../..)
-include $(JULIAHOME)/deps/Versions.make
 include $(JULIAHOME)/Make.inc
-include $(JULIAHOME)/deps/llvm-ver.make
-BUILDDIR = $(JULIAHOME)/deps/scratch
-include $(JULIAHOME)/deps/llvm-options.mk
-LLVM_SRC_DIR:=$(JULIAHOME)/deps/srccache/llvm-$(LLVM_VER)
 test:
- PATH=$$PATH:$(LLVM_BUILDDIR_withtype)/bin $(LLVM_SRC_DIR)/utils/lit/lit.py -v .
+ PATH=$(build_bindir):$(build_depsbindir):$$PATH $(build_depsbindir)/lit/lit.py -v $(SRCDIR)
 .PHONY: test
diff --git a/test/llvmpasses/alloc-opt.jl b/test/llvmpasses/alloc-opt.jl
@@ -28,7 +28,6 @@ define %jl_value_t addrspace(10)* @return_obj() {
 # CHECK-NOT: @julia.gc_alloc_obj
 # CHECK-NOT: @jl_gc_pool_alloc
 # CHECK: call void @llvm.lifetime.start{{.*}}(i64 8, i8*
-# CHECK-NEXT: %v64 = bitcast %jl_value_t* %v to i64*
 # CHECK-NOT: @tag
 # CHECK-NOT: @llvm.lifetime.end
 println("""
@@ -153,8 +152,8 @@ L3:
 # CHECK-LABEL: @object_field
 # CHECK: call %jl_value_t*** @julia.ptls_states()
 # CHECK-NOT: @julia.gc_alloc_obj
-# CHECK: @jl_gc_pool_alloc
-# CHECK: store %jl_value_t addrspace(10)* @tag, %jl_value_t addrspace(10)* addrspace(10)* {{.*}}, !tbaa !0
+# CHECK-NOT: @jl_gc_pool_alloc
+# CHECK-NOT: store %jl_value_t addrspace(10)* @tag, %jl_value_t addrspace(10)* addrspace(10)* {{.*}}, !tbaa !0
 println("""
 define void @object_field(%jl_value_t addrspace(10)* %field) {
  %ptls = call %jl_value_t*** @julia.ptls_states()
@@ -189,15 +188,11 @@ top:
 # CHECK-LABEL: }
 
 # CHECK-LABEL: @preserve_opt
-# CHECK: alloca i128, align 16
 # CHECK: call %jl_value_t*** @julia.ptls_states()
 # CHECK-NOT: @julia.gc_alloc_obj
 # CHECK-NOT: @jl_gc_pool_alloc
-# CHECK: @llvm.lifetime.start
 # CHECK-NOT: @llvm.lifetime.end
 # CHECK: @external_function
-# CHECK-NEXT: @llvm.lifetime.end
-# CHECK-NEXT: @external_function
 println("""
 define void @preserve_opt(i8* %v22) {
 top:
@@ -216,20 +211,16 @@ top:
 # CHECK-LABEL: }
 
 # CHECK-LABEL: @preserve_branches
-# CHECK: alloca i64
 # CHECK: call %jl_value_t*** @julia.ptls_states()
 # CHECK: L1:
-# CHECK-NEXT: call void @llvm.lifetime.start{{.*}}(i64 8,
 # CHECK-NEXT: @external_function()
 # CHECK-NEXT: br i1 %b2, label %L2, label %L3
 
 # CHECK: L2:
-# CHECK-NOT: call void @llvm.lifetime.end{{.*}}(i64 8,
 # CHECK: @external_function()
 # CHECK-NEXT: br label %L3
 
 # CHECK: L3:
-# CHECK-NEXT: call void @llvm.lifetime.end{{.*}}(i64 8,
 println("""
 define void @preserve_branches(i8* %fptr, i1 %b, i1 %b2) {
  %ptls = call %jl_value_t*** @julia.ptls_states()

diff --git a/test/llvmpasses/alloc-opt2.jl b/test/llvmpasses/alloc-opt2.jl
@@ -12,20 +12,17 @@ println("""
 # Test that the gc_preserve intrinsics are deleted directly.
 
 # CHECK-LABEL: @preserve_branches
-# CHECK: alloca i64
 # CHECK: call %jl_value_t*** @julia.ptls_states()
 # CHECK: L1:
-# CHECK-NEXT: call void @llvm.lifetime.start{{.*}}(i64 8,
+# CHECK-NOT: @llvm.julia.gc_preserve_begin
 # CHECK-NEXT: @external_function()
 # CHECK-NEXT: br i1 %b2, label %L2, label %L3
 
 # CHECK: L2:
-# CHECK-NOT: call void @llvm.lifetime.end{{.*}}(i64 8,
 # CHECK: @external_function()
 # CHECK-NEXT: br label %L3
 
 # CHECK: L3:
-# CHECK-NEXT: call void @llvm.lifetime.end{{.*}}(i64 8,
 println("""
 define void @preserve_branches(i8* %fptr, i1 %b, i1 %b2) {
  %ptls = call %jl_value_t*** @julia.ptls_states()
@@ -49,21 +46,17 @@ L3:
 # CHECK-LABEL: }
 
 # CHECK-LABEL: @preserve_branches2
-# CHECK: alloca i64
 # CHECK: call %jl_value_t*** @julia.ptls_states()
 # CHECK: L1:
-# CHECK-NEXT: call void @llvm.lifetime.start{{.*}}(i64 8,
 # CHECK-NEXT: @llvm.julia.gc_preserve_begin{{.*}}%jl_value_t addrspace(10)* %v2
 # CHECK-NEXT: @external_function()
 # CHECK-NEXT: br i1 %b2, label %L2, label %L3
 
 # CHECK: L2:
-# CHECK-NOT: call void @llvm.lifetime.end{{.*}}(i64 8,
 # CHECK: @external_function()
 # CHECK-NEXT: br label %L3
 
 # CHECK: L3:
-# CHECK-NEXT: call void @llvm.lifetime.end{{.*}}(i64 8,
 println("""
 define void @preserve_branches2(i8* %fptr, i1 %b, i1 %b2) {
  %ptls = call %jl_value_t*** @julia.ptls_states()