tree-wide: port LDC to LLVM 18 by liushuyu · Pull Request #4599 · ldc-developers/ldc

liushuyu · 2024-03-23T04:34:03Z

This pull request adds LLVM 18.1.x support to LDC.
LLVM recently switched to a new versioning scheme, where LLVM 18.1.0 was the first stable release of LLVM 18 series.

Aside from the usual API renaming, zext can not be used directly now and needs to be utilized through a constant folding mechanism.

thewilsonator · 2024-03-23T04:44:33Z

If you could add profdata and Filecheck (as done in this PR at the very bottom), that would be great

liushuyu · 2024-03-23T04:47:19Z

If you could add profdata and Filecheck (as done in this PR at the very bottom), that would be great

Will do. I cannot add LLVM 18 CI at the moment due to LLVM upstream missing binary packages for arm64 macOS.
I will open a separate pull request to address the CI issue.

liushuyu · 2024-03-23T05:37:18Z

If you could add profdata and Filecheck (as done in this PR at the very bottom), that would be great

@thewilsonator Done. Added files from LLVM upstream source.

kinke · 2024-03-23T13:01:23Z

Thx a lot, much appreciated!

driver/codegenerator.cpp

driver/toobj.cpp

kinke · 2024-03-23T13:07:31Z

gen/arrays.cpp

+#else
+      val = llvm::ConstantFoldCastOperand(llvm::Instruction::ZExt, val, I8PtrTy, *gDataLayout);
+#endif
+    }


This could probably be simplified to something like val = DtoConstUbyte(val->isNullValue() ? 0 : 1);.

@JohanEngelen: I just remembered #4559 - I guess this might be dangerous here too?

yeah, good point. At the very least, this change should be in its own PR, with careful checking.
Keep this (big) PR about LLVM18 compatibility only.

Should I just revert the changes to use LLVM constant folding here?

Yeah please, and sorry about the wrong hint.

Yeah please, and sorry about the wrong hint.

No problem, just a partial revert away. Now pushed.

gen/tocall.cpp

kinke · 2024-03-23T13:38:59Z

There's also

ldc/cmake/Modules/FindLLVM.cmake

Lines 30 to 63 in ef72ded

    
           # Try suffixed versions to pick up the newest LLVM install available on Debian 
        
           # derivatives. 
        
           # We also want an user-specified LLVM_ROOT_DIR to take precedence over the 
        
           # system default locations such as /usr/local/bin. Executing find_program() 
        
           # multiples times is the approach recommended in the docs. 
        
           set(llvm_config_names llvm-config-17.0 llvm-config170 llvm-config-17 
        
                                 llvm-config-16.0 llvm-config160 llvm-config-16 
        
                                 llvm-config-15.0 llvm-config150 llvm-config-15 
        
                                 llvm-config-14.0 llvm-config140 llvm-config-14 
        
                                 llvm-config-13.0 llvm-config130 llvm-config-13 
        
                                 llvm-config-12.0 llvm-config120 llvm-config-12 
        
                                 llvm-config-11.0 llvm-config110 llvm-config-11 
        
                                 llvm-config) 
        
           find_program(LLVM_CONFIG 
        
               NAMES ${llvm_config_names} 
        
               PATHS ${LLVM_ROOT_DIR}/bin NO_DEFAULT_PATH 
        
               DOC "Path to llvm-config tool.") 
        
           find_program(LLVM_CONFIG NAMES ${llvm_config_names}) 
        
           if(APPLE) 
        
               # extra fallbacks for MacPorts & Homebrew 
        
               find_program(LLVM_CONFIG 
        
                   NAMES ${llvm_config_names} 
        
                   PATHS /opt/local/libexec/llvm-17/bin 
        
                         /opt/local/libexec/llvm-16/bin /opt/local/libexec/llvm-15/bin 
        
                         /opt/local/libexec/llvm-14/bin /opt/local/libexec/llvm-13/bin 
        
                         /opt/local/libexec/llvm-12/bin /opt/local/libexec/llvm-11/bin 
        
                         /opt/local/libexec/llvm/bin 
        
                         /usr/local/opt/llvm@17/bin 
        
                         /usr/local/opt/llvm@16/bin /usr/local/opt/llvm@15/bin 
        
                         /usr/local/opt/llvm@14/bin /usr/local/opt/llvm@13/bin 
        
                         /usr/local/opt/llvm@12/bin /usr/local/opt/llvm@11/bin 
        
                         /usr/local/opt/llvm/bin 
        
                   NO_DEFAULT_PATH) 
        
           endif()

where we try to find a matching llvm-config* executable.

driver/toobj.cpp

liushuyu · 2024-03-24T02:20:08Z

CI failures seems unrelated and can be retried

gen/tocall.cpp

liushuyu · 2024-03-24T18:30:51Z

https://github.com/ldc-developers/ldc/actions/runs/8410785498/job/23029649005?pr=4599 This CI job needs a retry.

... LLVM upstream release v18.1.2

... upstream release v18.1.2

* Use getVoidPtrType helper * Replace #define with constexpr

kinke · 2024-03-27T16:44:09Z

[Following up with some fixes & additions in #4604.]

liushuyu mentioned this pull request Mar 23, 2024

CI: re-organize GitHub Actions #4600

Closed

kinke reviewed Mar 23, 2024

View reviewed changes

driver/codegenerator.cpp Outdated Show resolved Hide resolved

kinke reviewed Mar 23, 2024

View reviewed changes

driver/toobj.cpp Show resolved Hide resolved

kinke reviewed Mar 23, 2024

View reviewed changes

gen/tocall.cpp Outdated Show resolved Hide resolved

JohanEngelen reviewed Mar 23, 2024

View reviewed changes

driver/toobj.cpp Show resolved Hide resolved

liushuyu force-pushed the llvm-18 branch 3 times, most recently from b56613e to b330225 Compare March 23, 2024 22:21

kinke reviewed Mar 24, 2024

View reviewed changes

gen/tocall.cpp Outdated Show resolved Hide resolved

kinke approved these changes Mar 24, 2024

View reviewed changes

liushuyu force-pushed the llvm-18 branch 2 times, most recently from 9f4849f to 4bf2630 Compare March 24, 2024 16:53

liushuyu mentioned this pull request Mar 24, 2024

llvm 18 #4581

Closed

liushuyu added 4 commits March 26, 2024 14:45

tree-wide: port LDC to LLVM 18

b8a96fa

llvm-profdata-18.1.cpp: vendors llvm-profdata source from ...

579073a

... LLVM upstream release v18.1.2

FileCheck-18.cpp: vendors FileCheck.cpp source from LLVM ...

8ae2634

... upstream release v18.1.2

Multiple changes ...

fc4d884

* Use getVoidPtrType helper * Replace #define with constexpr

liushuyu force-pushed the llvm-18 branch from 4bf2630 to fc4d884 Compare March 26, 2024 20:49

kinke merged commit 29ef439 into ldc-developers:master Mar 27, 2024

liushuyu deleted the llvm-18 branch February 21, 2025 02:20

Uh oh!

Conversation

liushuyu commented Mar 23, 2024

Uh oh!

thewilsonator commented Mar 23, 2024

Uh oh!

liushuyu commented Mar 23, 2024

Uh oh!

liushuyu commented Mar 23, 2024

Uh oh!

kinke commented Mar 23, 2024

Uh oh!

Uh oh!

Uh oh!

kinke Mar 23, 2024

Choose a reason for hiding this comment

Uh oh!

liushuyu Mar 23, 2024

Choose a reason for hiding this comment

Uh oh!

kinke Mar 26, 2024

Choose a reason for hiding this comment

Uh oh!

JohanEngelen Mar 26, 2024

Choose a reason for hiding this comment

Uh oh!

liushuyu Mar 26, 2024

Choose a reason for hiding this comment

Uh oh!

kinke Mar 26, 2024

Choose a reason for hiding this comment

Uh oh!

liushuyu Mar 26, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kinke commented Mar 23, 2024

Uh oh!

Uh oh!

liushuyu commented Mar 24, 2024

Uh oh!

Uh oh!

liushuyu commented Mar 24, 2024

Uh oh!

kinke commented Mar 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants