Skip to content

Commit

Permalink
Add LLVM patch to correctly recognise ICC17 as GCC compatible. (#20266)
Browse files Browse the repository at this point in the history
  • Loading branch information
vchuravy authored and tkelman committed Jan 29, 2017
1 parent 3de7fc8 commit a087c38
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
1 change: 1 addition & 0 deletions deps/llvm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ $(eval $(call LLVM_PATCH,llvm-D27397)) # Julia issue #19792, Remove for 4.0
$(eval $(call LLVM_PATCH,llvm-D28009)) # Julia issue #19792, Remove for 4.0
$(eval $(call LLVM_PATCH,llvm-D28215_FreeBSD_shlib))
$(eval $(call LLVM_PATCH,llvm-D28221-avx512)) # mentioned in issue #19797
$(eval $(call LLVM_PATCH,llvm-rL293230-icc17-cmake)) # Remove for 5.0
endif # LLVM_VER

ifeq ($(LLVM_VER),3.7.1)
Expand Down
35 changes: 35 additions & 0 deletions deps/patches/llvm-rL293230-icc17-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From eca8aa608d962e09ea9710670f1c412f608a6f12 Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Thu, 26 Jan 2017 23:50:18 +0000
Subject: [PATCH] CMake is funky on detecting Intel 17 as GCC compatible.

Summary: This adds a fallback in case that the Intel compiler is failed to be detected correctly.

Reviewers: chapuni

Reviewed By: chapuni

Subscribers: llvm-commits, mgorny

Differential Revision: https://reviews.llvm.org/D27610

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@293230 91177308-0d34-0410-b5e6-96231b3b80d8
---
cmake/modules/DetermineGCCCompatible.cmake | 2 ++
1 file changed, 2 insertions(+)

diff --git a/cmake/modules/DetermineGCCCompatible.cmake b/cmake/modules/DetermineGCCCompatible.cmake
index 1bf15fcba72..1369ebe9d0e 100644
--- a/cmake/modules/DetermineGCCCompatible.cmake
+++ b/cmake/modules/DetermineGCCCompatible.cmake
@@ -7,5 +7,7 @@ if(NOT DEFINED LLVM_COMPILER_IS_GCC_COMPATIBLE)
set(LLVM_COMPILER_IS_GCC_COMPATIBLE OFF)
elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
+ elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )
+ set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
endif()
endif()
--
2.11.0

3 comments on commit a087c38

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily benchmark build, I will reply here when finished:

@nanosoldier runbenchmarks(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something went wrong when running your job:

NanosoldierError: failed to run benchmarks against primary commit: ErrorException("failed process: Process(`sudo cset shield -e su nanosoldier -- -c ./benchscript.sh`, ProcessExited(1)) [1]")

Logs and partial data can be found here
cc @jrevels

@vchuravy
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JeffBezanson @vtjnash This looks like a something in inference/subtype.c : https://raw.githubusercontent.com/JuliaCI/BaseBenchmarkReports/203b5f4a8efaa25a27180a7bb0b2d1f1c4a66546/daily_2017_1_29/logs/a087c38ed851d81301591af0b91d6adc42218074_primary.err

intersect_var at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1066
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1628
intersect_ufirst at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1032 [inlined]
intersect_var at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1100
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1628
...
intersect_ufirst at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1032 [inlined]
intersect_var at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1100
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1628
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1710
intersect_unionall_ at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1258
intersect_unionall at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1303
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1687
intersect_tuple at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1402 [inlined]
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1701
intersect_invariant at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1492
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1735
intersect_unionall_ at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1262
intersect_unionall at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1309
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1684
intersect_unionall_ at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1262
intersect_unionall at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1303
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1684
intersect_tuple at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1402 [inlined]
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1701
intersect_unionall_ at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1258
intersect_unionall at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1309
intersect at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1687
intersect_all at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1771
jl_type_intersection_env_s at /home/nanosoldier/workdir/tmpHFJkKg/src/subtype.c:1836
jl_typemap_intersection_node_visitor at /home/nanosoldier/workdir/tmpHFJkKg/src/typemap.c:475
jl_typemap_intersection_visitor at /home/nanosoldier/workdir/tmpHFJkKg/src/typemap.c:539
jl_typemap_intersection_visitor at /home/nanosoldier/workdir/tmpHFJkKg/src/typemap.c:530
ml_matches at /home/nanosoldier/workdir/tmpHFJkKg/src/gf.c:2668
jl_matching_methods at /home/nanosoldier/workdir/tmpHFJkKg/src/gf.c:1563
_methods_by_ftype at ./reflection.jl:395
unknown function (ip: 0x7ffff17e8fc4)
jl_call_method_internal at /home/nanosoldier/workdir/tmpHFJkKg/src/julia_internal.h:248 [inlined]
jl_apply_generic at /home/nanosoldier/workdir/tmpHFJkKg/src/gf.c:2217
abstract_call_gf_by_type at ./inference.jl:1190
unknown function (ip: 0x7ffff17eb296)
jl_call_method_internal at /home/nanosoldier/workdir/tmpHFJkKg/src/julia_internal.h:248 [inlined]
jl_apply_generic at /home/nanosoldier/workdir/tmpHFJkKg/src/gf.c:2217
abstract_call at ./inference.jl:1639
unknown function (ip: 0x7ffff17e729e)
jl_call_method_internal at /home/nanosoldier/workdir/tmpHFJkKg/src/julia_internal.h:248 [inlined]
jl_apply_generic at /home/nanosoldier/workdir/tmpHFJkKg/src/gf.c:2217
abstract_eval_call at ./inference.jl:1669
abstract_eval at ./inference.jl:1692
unknown function (ip: 0x7ffff17e34e6)
jl_call_method_internal at /home/nanosoldier/workdir/tmpHFJkKg/src/julia_internal.h:248 [inlined]
jl_apply_generic at /home/nanosoldier/workdir/tmpHFJkKg/src/gf.c:2217
abstract_eval at ./inference.jl:1698
unknown function (ip: 0x7ffff17e34e6)
jl_call_method_internal at /home/nanosoldier/workdir/tmpHFJkKg/src/julia_internal.h:248 [inlined]
jl_apply_generic at /home/nanosoldier/workdir/tmpHFJkKg/src/gf.c:2217
typeinf_frame at ./inference.jl:2541
typeinf_loop at ./inference.jl:2376
typeinf_frame at ./inference.jl:2246
typeinf_edge at ./inference.jl:2269

Please sign in to comment.