[flang][openacc] Allow acc routine before implicit part #71460
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-fir-hlfir @llvm/pr-subscribers-openacc Author: Valentin Clement (バレンタイン クレメン) (clementval) ChangesAllow position of the acc routine in the implicit part. Full diff: https://github.com/llvm/llvm-project/pull/71460.diff 3 Files Affected:
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 4806fc49f3441de..393e0e24ec5cbd9 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -413,7 +413,8 @@ struct ImplicitPartStmt {
Statement<common::Indirection<OldParameterStmt>>,
Statement<common::Indirection<FormatStmt>>,
Statement<common::Indirection<EntryStmt>>,
- common::Indirection<CompilerDirective>>
+ common::Indirection<CompilerDirective>,
+ common::Indirection<OpenACCDeclarativeConstruct>>
u;
};
diff --git a/flang/lib/Parser/Fortran-parsers.cpp b/flang/lib/Parser/Fortran-parsers.cpp
index d7e01c924c6b32c..c070bc1de37352f 100644
--- a/flang/lib/Parser/Fortran-parsers.cpp
+++ b/flang/lib/Parser/Fortran-parsers.cpp
@@ -114,7 +114,8 @@ TYPE_PARSER(first(
construct<ImplicitPartStmt>(statement(indirect(oldParameterStmt))),
construct<ImplicitPartStmt>(statement(indirect(formatStmt))),
construct<ImplicitPartStmt>(statement(indirect(entryStmt))),
- construct<ImplicitPartStmt>(indirect(compilerDirective))))
+ construct<ImplicitPartStmt>(indirect(compilerDirective)),
+ construct<ImplicitPartStmt>(indirect(openaccDeclarativeConstruct))))
// R512 internal-subprogram -> function-subprogram | subroutine-subprogram
// Internal subprograms are not program units, so their END statements
diff --git a/flang/test/Lower/OpenACC/acc-routine04.f90 b/flang/test/Lower/OpenACC/acc-routine04.f90
new file mode 100644
index 000000000000000..f7b1d50af2bda30
--- /dev/null
+++ b/flang/test/Lower/OpenACC/acc-routine04.f90
@@ -0,0 +1,34 @@
+! This test checks correct lowering when OpenACC routine directive is placed
+! before implicit none.
+
+! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s
+
+module dummy_mod
+contains
+
+ subroutine sub1(i)
+ !$acc routine seq
+ integer :: i
+ end subroutine
+end module
+
+program test_acc_routine
+ use dummy_mod
+
+ !$acc routine(sub2) seq
+
+ implicit none
+
+ integer :: i
+
+contains
+ subroutine sub2()
+ end subroutine
+
+end program
+
+! CHECK: acc.routine @acc_routine_1 func(@_QFPsub2) seq
+! CHECK: acc.routine @acc_routine_0 func(@_QMdummy_modPsub1) seq
+! CHECK: func.func @_QMdummy_modPsub1(%arg0: !fir.ref<i32> {fir.bindc_name = "i"}) attributes {acc.routine_info = #acc.routine_info<[@acc_routine_0]>}
+! CHECK: func.func @_QQmain() attributes {fir.bindc_name = "test_acc_routine"}
|
|
@llvm/pr-subscribers-flang-parser Author: Valentin Clement (バレンタイン クレメン) (clementval) ChangesAllow position of the acc routine in the implicit part. Full diff: https://github.com/llvm/llvm-project/pull/71460.diff 3 Files Affected:
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 4806fc49f3441de..393e0e24ec5cbd9 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -413,7 +413,8 @@ struct ImplicitPartStmt {
Statement<common::Indirection<OldParameterStmt>>,
Statement<common::Indirection<FormatStmt>>,
Statement<common::Indirection<EntryStmt>>,
- common::Indirection<CompilerDirective>>
+ common::Indirection<CompilerDirective>,
+ common::Indirection<OpenACCDeclarativeConstruct>>
u;
};
diff --git a/flang/lib/Parser/Fortran-parsers.cpp b/flang/lib/Parser/Fortran-parsers.cpp
index d7e01c924c6b32c..c070bc1de37352f 100644
--- a/flang/lib/Parser/Fortran-parsers.cpp
+++ b/flang/lib/Parser/Fortran-parsers.cpp
@@ -114,7 +114,8 @@ TYPE_PARSER(first(
construct<ImplicitPartStmt>(statement(indirect(oldParameterStmt))),
construct<ImplicitPartStmt>(statement(indirect(formatStmt))),
construct<ImplicitPartStmt>(statement(indirect(entryStmt))),
- construct<ImplicitPartStmt>(indirect(compilerDirective))))
+ construct<ImplicitPartStmt>(indirect(compilerDirective)),
+ construct<ImplicitPartStmt>(indirect(openaccDeclarativeConstruct))))
// R512 internal-subprogram -> function-subprogram | subroutine-subprogram
// Internal subprograms are not program units, so their END statements
diff --git a/flang/test/Lower/OpenACC/acc-routine04.f90 b/flang/test/Lower/OpenACC/acc-routine04.f90
new file mode 100644
index 000000000000000..f7b1d50af2bda30
--- /dev/null
+++ b/flang/test/Lower/OpenACC/acc-routine04.f90
@@ -0,0 +1,34 @@
+! This test checks correct lowering when OpenACC routine directive is placed
+! before implicit none.
+
+! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s
+
+module dummy_mod
+contains
+
+ subroutine sub1(i)
+ !$acc routine seq
+ integer :: i
+ end subroutine
+end module
+
+program test_acc_routine
+ use dummy_mod
+
+ !$acc routine(sub2) seq
+
+ implicit none
+
+ integer :: i
+
+contains
+ subroutine sub2()
+ end subroutine
+
+end program
+
+! CHECK: acc.routine @acc_routine_1 func(@_QFPsub2) seq
+! CHECK: acc.routine @acc_routine_0 func(@_QMdummy_modPsub1) seq
+! CHECK: func.func @_QMdummy_modPsub1(%arg0: !fir.ref<i32> {fir.bindc_name = "i"}) attributes {acc.routine_info = #acc.routine_info<[@acc_routine_0]>}
+! CHECK: func.func @_QQmain() attributes {fir.bindc_name = "test_acc_routine"}
|
vzakhari
reviewed
Nov 6, 2023
| ! CHECK: acc.routine @acc_routine_1 func(@_QFPsub2) seq | ||
| ! CHECK: acc.routine @acc_routine_0 func(@_QMdummy_modPsub1) seq | ||
| ! CHECK: func.func @_QMdummy_modPsub1(%arg0: !fir.ref<i32> {fir.bindc_name = "i"}) attributes {acc.routine_info = #acc.routine_info<[@acc_routine_0]>} | ||
| ! CHECK: func.func @_QQmain() attributes {fir.bindc_name = "test_acc_routine"} |
There was a problem hiding this comment.
Can you please add a check that sub2 has acc_routine_1 attached?
This was referenced Nov 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow position of the acc routine in the implicit part.