This is an archive of the discontinued LLVM Phabricator instance.

[Fortran][hlfir] update openmp denylists with new fixes
ClosedPublic

Authored by tblah on Aug 1 2023, 11:02 AM.

Diff Detail

Repository
rT test-suite

Event Timeline

tblah created this revision.Aug 1 2023, 11:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 1 2023, 11:02 AM
tblah requested review of this revision.Aug 1 2023, 11:02 AM
tarunprabhu requested changes to this revision.Aug 1 2023, 1:52 PM
tarunprabhu added inline comments.
Fortran/gfortran/regression/gomp/DisabledFilesHLFIR.cmake
9

It might be preferable to have something like this to indicate where SKIPPED_FILES has been defined instead of just omitting it altogether. While omitting it will work, but being explicit - if a bit verbose - might make maintenance easier.

set(SKIPPED_FILES "")
This revision now requires changes to proceed.Aug 1 2023, 1:52 PM
tblah added a subscriber: vzakhari.Aug 2 2023, 1:40 AM
tblah added inline comments.
Fortran/gfortran/regression/gomp/DisabledFilesHLFIR.cmake
9

@vzakhari asked on my last patch that I reset the variables once in CMakeLists.txt and not mention them in every included file. https://reviews.llvm.org/D156130#4532372

But if you would rather keep the set(VARIABLE "") then I don't mind changing

tarunprabhu added inline comments.Aug 2 2023, 7:48 AM
Fortran/gfortran/regression/gomp/DisabledFilesHLFIR.cmake
9

I'm not fan of all those empty declarations in the files either and agree that it would be better to declare them just once in that macro. However, I would prefer to leave them be for now. There may be more churn on that front as development continues and having those be explicit seems preferable to me. I would prefer to get rid of the unnecessary files when things are more stable and there is less likelihood of having to reintroduce those lists because of some new feature development.

If @vzakhari has strong views the other way, I'm willing to defer to those.

vzakhari added inline comments.Aug 2 2023, 8:25 AM
Fortran/gfortran/regression/gomp/DisabledFilesHLFIR.cmake
9

It sounds like trying to use code redundancy for documentation. If this is the reason you want to have the empty set commands, may I suggest just putting a link to the documentation describing all the support variables into each feature cmake file? This way if we need to change the set of supported variables, we do not need to go through all the dummy set commands and renamed/delete them.

@tblah On x86_64, with HLFIR enabled, regression/achar_4.f90 fails with the error 'fir.convert' op invalid type conversion. I don't think it is related to this patch, but I am not sure. I assume that you are on AArch64 and don't see this?

Fortran/gfortran/regression/gomp/DisabledFilesHLFIR.cmake
9

@vzakhari That's a fair point. I'm working on updating the list of top-level disabled tests. I'll consider performing some sort of cleanup then.

tblah added a comment.Aug 3 2023, 2:41 AM

@tblah On x86_64, with HLFIR enabled, regression/achar_4.f90 fails with the error 'fir.convert' op invalid type conversion. I don't think it is related to this patch, but I am not sure. I assume that you are on AArch64 and don't see this?

I can't reproduce that on my aarch64 machine, although this test doesn't look like it should change much between architectures. I tested on llvm-project commit eb6987027e0504adcdc319f080a9ea48aab2a72a both with and without optimization flags.

But if it doesn't pass for you, I think we should disable it for now (it should be removed from Fortran/gfortran/regression/EnabledFilesHLFIR.cmake). But I think it should be done separately to this patch as it is unrelated. Let me know if you would like me to put a patch up for this.

tarunprabhu accepted this revision.Aug 3 2023, 7:01 AM

I just checked again on 29dec352124a5fc1dcf03a640c2621496651ee90 and it still breaks.

A separate patch will be helpful. Thanks!

This revision is now accepted and ready to land.Aug 3 2023, 7:01 AM
This revision was automatically updated to reflect the committed changes.
tblah added a comment.Aug 4 2023, 4:27 AM

I just checked again on 29dec352124a5fc1dcf03a640c2621496651ee90 and it still breaks.

A separate patch will be helpful. Thanks!

https://reviews.llvm.org/D157084