Skip to content

llvm: add new versions and set default for libomptarget according to os#38092

Merged
naromero77 merged 2 commits intospack:developfrom
s-sajid-ali:sajid/llvm_fixes_versions
Jun 7, 2023
Merged

llvm: add new versions and set default for libomptarget according to os#38092
naromero77 merged 2 commits intospack:developfrom
s-sajid-ali:sajid/llvm_fixes_versions

Conversation

@s-sajid-ali
Copy link
Copy Markdown
Contributor

@s-sajid-ali s-sajid-ali commented Jun 2, 2023

On a mac with +libomptarget, one gets :

libomptarget cannot be built on Windows and MacOS X!

on os x.

Reference: https://github.com/llvm/llvm-project/blob/48bb7bb868919a090492bffb9f3c170dae5250eb/openmp/CMakeLists.txt#L101-L112

Additionally, add checksums for new versions.

@naromero77
Copy link
Copy Markdown
Contributor

New versions are OK, but there is a recent merge that created conflicts that now need to be resolved.

@s-sajid-ali s-sajid-ali force-pushed the sajid/llvm_fixes_versions branch from b9bf8b3 to ba5307f Compare June 5, 2023 14:29
@s-sajid-ali
Copy link
Copy Markdown
Contributor Author

Rebased over develop.

@s-sajid-ali s-sajid-ali force-pushed the sajid/llvm_fixes_versions branch from 025eaa3 to 37506df Compare June 5, 2023 14:36
	modified:   var/spack/repos/builtin/packages/llvm/package.py
@s-sajid-ali s-sajid-ali force-pushed the sajid/llvm_fixes_versions branch from 94c7d4f to 98952bd Compare June 5, 2023 15:56
@naromero77
Copy link
Copy Markdown
Contributor

@skosukhin Could you please review?

Co-authored-by: Sergey Kosukhin <[email protected]>
Copy link
Copy Markdown
Contributor

@naromero77 naromero77 left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Will wait for additional comments/approval from @skosukhin.

@naromero77 naromero77 merged commit 7492178 into spack:develop Jun 7, 2023
@s-sajid-ali s-sajid-ali deleted the sajid/llvm_fixes_versions branch June 7, 2023 15:57
greenc-FNAL pushed a commit to FNALssi/spack that referenced this pull request Jul 19, 2023
…os (spack#38092)

* llvm: add new versions and set default for libomptarget according to os

	modified:   var/spack/repos/builtin/packages/llvm/package.py

* Incorporate reviewer suggestions

Co-authored-by: Sergey Kosukhin <[email protected]>

---------

Co-authored-by: Sergey Kosukhin <[email protected]>
greenc-FNAL pushed a commit to FNALssi/spack that referenced this pull request Aug 22, 2023
…os (spack#38092)

* llvm: add new versions and set default for libomptarget according to os

	modified:   var/spack/repos/builtin/packages/llvm/package.py

* Incorporate reviewer suggestions

Co-authored-by: Sergey Kosukhin <[email protected]>

---------

Co-authored-by: Sergey Kosukhin <[email protected]>
greenc-FNAL pushed a commit to greenc-FNAL/spack that referenced this pull request Aug 22, 2023
…os (spack#38092)

* llvm: add new versions and set default for libomptarget according to os

	modified:   var/spack/repos/builtin/packages/llvm/package.py

* Incorporate reviewer suggestions

Co-authored-by: Sergey Kosukhin <[email protected]>

---------

Co-authored-by: Sergey Kosukhin <[email protected]>
greenc-FNAL pushed a commit to FNALssi/spack that referenced this pull request Aug 23, 2023
…os (spack#38092)

* llvm: add new versions and set default for libomptarget according to os

	modified:   var/spack/repos/builtin/packages/llvm/package.py

* Incorporate reviewer suggestions

Co-authored-by: Sergey Kosukhin <[email protected]>

---------

Co-authored-by: Sergey Kosukhin <[email protected]>
greenc-FNAL pushed a commit to FNALssi/spack that referenced this pull request Aug 23, 2023
…os (spack#38092)

* llvm: add new versions and set default for libomptarget according to os

	modified:   var/spack/repos/builtin/packages/llvm/package.py

* Incorporate reviewer suggestions

Co-authored-by: Sergey Kosukhin <[email protected]>

---------

Co-authored-by: Sergey Kosukhin <[email protected]>
marcmengel pushed a commit to FNALssi/spack that referenced this pull request Aug 23, 2023
* llvm: add version 16.0.3 (spack#37472)

* llvm: Fix hwloc@1 and hwloc@:2.3 compatibility (spack#35387)

* llvm: optionally build compiler-rt, libcxx and libunwind as runtimes (spack#32476)

* llvm: replace +omp_as_runtime with omp=runtime

* llvm: fetch 'libomp-libflags-as-list.patch' from upstream repo

* llvm: replace 'llvm14-hwloc-ompd.patch' with the official fix from upstream repo

* llvm: fix-up for the black reformatting

* llvm: fetch 'constexpr_longdouble.patch' from upstream repo

* llvm: optionally build libcxx as a runtime

* llvm: fetch 'llvm5-sanitizer-ustat.patch' from upstream repo

* llvm: update 'sanitizer-ipc_perm_mode.patch'

* llvm: refactor compiler conflicts when libcxx=project

* llvm: fetch 'llvm_python_path.patch' from upstream repo

* llvm: update comments and condition for 'xray_buffer_queue-cstddef.patch'

* llvm: optionally build compiler-rt as a runtime

* llvm: fetch 'lldb_external_ncurses-10.patch' from upstream repo

* llvm: fetch 'llvm_py37.patch' from upstream repo

* llvm: rename variant 'internal_unwind' to 'libunwind'

* llvm: optionally build libunwind as a runtime

* llvm: extend the list of maintainers

* llvm: allow for explicit '~clang~flang~libomptarget~lldb~omp_debug~z3'

* llvm: fetch 'llvm5-lld-ELF-Symbols.patch' from FreeBSD port repo

* llvm: fetch most of 'missing-includes.patch' from upstream repo and reuse 'llvm-gcc11.patch'

* llvm: regroup patches for missing include directives and drop compiler constraints for them

* llvm: fetch 'llvm-gcc11.patch' from upstream repo

* llvm: fetch 'no_cyclades.patch' from upstream repo

* llvm: update comments and condition for 'no_cyclades9.patch'

* llvm: rename variant 'omp' to 'openmp'

* llvm: constrain and rename variant 'omp_tsan' to 'libomp_tsan'

* llvm: rename variant 'omp_debug' to 'libomptarget_debug'

* llvm: do not apply same patch twice

* llvm: constrain and document the '*-thread.patch' patches

* llvm: document the '~lld+libomptarget' conflict

* llvm: update comments for the 'D133513.diff' patch

* llvm: add new versions and set default for libomptarget according to os (spack#38092)

* llvm: add new versions and set default for libomptarget according to os

	modified:   var/spack/repos/builtin/packages/llvm/package.py

* Incorporate reviewer suggestions

Co-authored-by: Sergey Kosukhin <[email protected]>

---------

Co-authored-by: Sergey Kosukhin <[email protected]>

* Add 1606 (spack#38511)

* llvm: fix build against libstdc++ 13 (spack#38329)

llvm @13-15 is required for ispc, but fails to build with GCC 13.
14.0.6 and 15.0.7 built successfully with upstream patch, 13.0.1
still fails. Thus upstream patch is applied to 14 and 15 only.

* ispc: on ARM, build with ARM targets enabled, and updates (spack#38080)

* llvm: fix build with libcxx=none

* ispc: checksum 1.20.0

* ispc: ensure that it does not crash immediately

this would happen if linked to the wrong libc++

* ispc: fix build on macos

find ncurses instead of curses and link against tinfo in order to avoid
unresolved references to _del_curterm, _set_curterm, _setupterm, and
_tigetnum

* ispc: enable arm targets, if building on arm

* ispc: remove double cmake argument

I forgot to remove the constant -DARM_ENABLED=FALSE when adding
-DARM_ENABLED with a value depending on target architecture

* ispc: fix linux build

since 1.20, linux build uses TBB as default tasking system and thus
needs to depend on it

* ispc: try to fix link error on linux

link against both curses (as before) and tinfo (added because of macos)

* ispc: update for recent llvm changes

libcxx=none instead of ~libcxx

---------

Co-authored-by: Satish Balay <[email protected]>
Co-authored-by: Jordan Galby <[email protected]>
Co-authored-by: Sergey Kosukhin <[email protected]>
Co-authored-by: Sajid Ali <[email protected]>
Co-authored-by: Sergey Kosukhin <[email protected]>
Co-authored-by: Paul R. C. Kent <[email protected]>
Co-authored-by: Martin Aumüller <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants