This is an archive of the discontinued LLVM Phabricator instance.

Differential D51694

Fix for https://bugs.llvm.org/show_bug.cgi?id=38839
ClosedPublic

Authored by AndreyChurbanov on Sep 5 2018, 10:41 AM.

Details

Reviewers
jlpeyton
hbae
omalyshe
pawosm01
Commits
rGd946778b9f5d: Fix for https://bugs.llvm.org/show_bug.cgi?id=38839:
rOMP341653: Fix for https://bugs.llvm.org/show_bug.cgi?id=38839:
rL341653: Fix for https://bugs.llvm.org/show_bug.cgi?id=38839:
Summary

Squeezed spaces, splitted long lines so that all lines have no more than 72 characters.

Diff Detail

Repository
rOMP OpenMP

Event Timeline

AndreyChurbanov created this revision.Sep 5 2018, 10:41 AM
Herald added a subscriber: openmp-commits. · View Herald TranscriptSep 5 2018, 10:41 AM
jlpeyton added inline comments.Sep 5 2018, 11:12 AM
runtime/src/include/50/omp_lib.h.var
27–29

Aren't these longer than 72 chars?

AndreyChurbanov added inline comments.Sep 5 2018, 11:21 AM
runtime/src/include/50/omp_lib.h.var
27–29

Yes - before variables substitution, and NO - after the substitution performed during the build.
LIBOMP_OMP_YEAR_MONTH - 6 chars, LIBOMP_VERSION* - single char each.
So the built header has these lines short enough.

jlpeyton accepted this revision.Sep 5 2018, 11:25 AM

Alright, that makes sense. LGTM.

This revision is now accepted and ready to land.Sep 5 2018, 11:25 AM
pawosm01 added a subscriber: pawosm01.Sep 5 2018, 11:25 AM
pawosm01 added inline comments.
runtime/src/include/50/omp_lib.h.var
30

It's not gonna work if someone use fixed format and extended line len, compiler will fail on this & at end.
There are omp_lib.h implementation that are

  1. fixed format
  2. yet still have lines no longer than 72 characters

so they can be always included, e.g.:
https://github.com/flang-compiler/flang/blob/master/include/omp_lib.h

AndreyChurbanov added a comment.Sep 6 2018, 1:40 AM

I am a bit puzzled by the requirement for the file to be compilable in free or fixed form and with 72 or 132 line width, because of the line:

integer(kind=omp_control_tool_result_kind)omp_control_tool_nocallback

Not sure if it is possible at all.

AndreyChurbanov updated this revision to Diff 164170.Sep 6 2018, 2:08 AM

Changed the style so that all lines have length less than 72 char.
The kind of the longest variable "omp_control_tool_nocallback" changed from "omp_control_tool_result_kind" to be the parent kind "omp_integer_kind", thus the declaration line fits 72 chars (could not come up with a better solution for this variable).

Alternatively tried to place continuation sign "&" to post 132 location, but this looks like a non-standard trick, though Intel compiler works with this.

AndreyChurbanov marked an inline comment as done.Sep 7 2018, 4:38 AM
pawosm01 accepted this revision.Sep 7 2018, 5:03 AM
Closed by commit rL341653: Fix for https://bugs.llvm.org/show_bug.cgi?id=38839: (authored by achurbanov). · Explain WhySep 7 2018, 5:23 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptSep 7 2018, 5:23 AM

Revision Contents

PathSize
runtime/
src/
include/
50/
149 lines

Diff 164170

runtime/src/include/50/omp_lib.h.var

! include/50/omp_lib.h.var ! include/50/omp_lib.h.var
! !
!//===----------------------------------------------------------------------===// !//===----------------------------------------------------------------------===//
!// !//
!// The LLVM Compiler Infrastructure !// The LLVM Compiler Infrastructure
!// !//
!// This file is dual licensed under the MIT and the University of Illinois Open !// This file is dual licensed under the MIT and the University of Illinois Open
!// Source Licenses. See LICENSE.txt for details. !// Source Licenses. See LICENSE.txt for details.
!// !//
!//===----------------------------------------------------------------------===// !//===----------------------------------------------------------------------===//
! !
!*** integer omp_integer_kind
!*** Some of the directives for the following routine extend past column 72, parameter(omp_integer_kind=4)
!*** so process this file in 132-column mode. integer omp_logical_kind
!*** parameter(omp_logical_kind=4)
integer omp_real_kind
!DIR$ fixedformlinesize:132 parameter(omp_real_kind=4)
integer omp_lock_kind
integer, parameter :: omp_integer_kind = 4 parameter(omp_lock_kind=int_ptr_kind())
integer, parameter :: omp_logical_kind = 4 integer omp_nest_lock_kind
integer, parameter :: omp_real_kind = 4 parameter(omp_nest_lock_kind=int_ptr_kind())
integer, parameter :: omp_lock_kind = int_ptr_kind() integer omp_sched_kind
integer, parameter :: omp_nest_lock_kind = int_ptr_kind() parameter(omp_sched_kind=omp_integer_kind)
integer, parameter :: omp_sched_kind = omp_integer_kind integer omp_proc_bind_kind
integer, parameter :: omp_proc_bind_kind = omp_integer_kind parameter(omp_proc_bind_kind=omp_integer_kind)
integer, parameter :: kmp_pointer_kind = int_ptr_kind() integer kmp_pointer_kind
integer, parameter :: kmp_size_t_kind = int_ptr_kind() parameter(kmp_pointer_kind=int_ptr_kind())
jlpeytonUnsubmitted
Not Done
ReplyInline Actions

Aren't these longer than 72 chars?

jlpeyton: Aren't these longer than 72 chars?
AndreyChurbanovAuthorUnsubmitted
Not Done
ReplyInline Actions

Yes - before variables substitution, and NO - after the substitution performed during the build.
LIBOMP_OMP_YEAR_MONTH - 6 chars, LIBOMP_VERSION* - single char each.
So the built header has these lines short enough.

AndreyChurbanov: Yes - before variables substitution, and NO - after the substitution performed during the build.
integer, parameter :: kmp_affinity_mask_kind = int_ptr_kind() integer kmp_size_t_kind
pawosm01Unsubmitted
Done
ReplyInline Actions

It's not gonna work if someone use fixed format and extended line len, compiler will fail on this & at end.
There are omp_lib.h implementation that are

  1. fixed format
  2. yet still have lines no longer than 72 characters

so they can be always included, e.g.:
https://github.com/flang-compiler/flang/blob/master/include/omp_lib.h

pawosm01: It's not gonna work if someone use fixed format and extended line len, compiler will fail on…
integer, parameter :: omp_lock_hint_kind = omp_integer_kind parameter(kmp_size_t_kind=int_ptr_kind())
integer, parameter :: omp_control_tool_kind = omp_integer_kind integer kmp_affinity_mask_kind
integer, parameter :: omp_control_tool_result_kind = omp_integer_kind parameter(kmp_affinity_mask_kind=int_ptr_kind())
integer omp_lock_hint_kind
integer (kind=omp_integer_kind), parameter :: openmp_version = @LIBOMP_OMP_YEAR_MONTH@ parameter(omp_lock_hint_kind=omp_integer_kind)
integer (kind=omp_integer_kind), parameter :: kmp_version_major = @LIBOMP_VERSION_MAJOR@ integer omp_control_tool_kind
integer (kind=omp_integer_kind), parameter :: kmp_version_minor = @LIBOMP_VERSION_MINOR@ parameter(omp_control_tool_kind=omp_integer_kind)
integer (kind=omp_integer_kind), parameter :: kmp_version_build = @LIBOMP_VERSION_BUILD@ integer omp_control_tool_result_kind
parameter(omp_control_tool_result_kind=omp_integer_kind)
integer(kind=omp_integer_kind)openmp_version
parameter(openmp_version=@LIBOMP_OMP_YEAR_MONTH@)
integer(kind=omp_integer_kind)kmp_version_major
parameter(kmp_version_major=@LIBOMP_VERSION_MAJOR@)
integer(kind=omp_integer_kind)kmp_version_minor
parameter(kmp_version_minor=@LIBOMP_VERSION_MINOR@)
integer(kind=omp_integer_kind)kmp_version_build
parameter(kmp_version_build=@LIBOMP_VERSION_BUILD@)
character(*) kmp_build_date character(*)kmp_build_date
parameter( kmp_build_date = '@LIBOMP_BUILD_DATE@' ) parameter(kmp_build_date='@LIBOMP_BUILD_DATE@')
integer(kind=omp_sched_kind), parameter :: omp_sched_static = 1 integer(kind=omp_sched_kind)omp_sched_static
integer(kind=omp_sched_kind), parameter :: omp_sched_dynamic = 2 parameter(omp_sched_static=1)
integer(kind=omp_sched_kind), parameter :: omp_sched_guided = 3 integer(kind=omp_sched_kind)omp_sched_dynamic
integer(kind=omp_sched_kind), parameter :: omp_sched_auto = 4 parameter(omp_sched_dynamic=2)
integer(kind=omp_sched_kind)omp_sched_guided
integer (kind=omp_proc_bind_kind), parameter :: omp_proc_bind_false = 0 parameter(omp_sched_guided=3)
integer (kind=omp_proc_bind_kind), parameter :: omp_proc_bind_true = 1 integer(kind=omp_sched_kind)omp_sched_auto
integer (kind=omp_proc_bind_kind), parameter :: omp_proc_bind_master = 2 parameter(omp_sched_auto=4)
integer (kind=omp_proc_bind_kind), parameter :: omp_proc_bind_close = 3
integer (kind=omp_proc_bind_kind), parameter :: omp_proc_bind_spread = 4 integer(kind=omp_proc_bind_kind)omp_proc_bind_false
parameter(omp_proc_bind_false=0)
integer (kind=omp_lock_hint_kind), parameter :: omp_lock_hint_none = 0 integer(kind=omp_proc_bind_kind)omp_proc_bind_true
integer (kind=omp_lock_hint_kind), parameter :: omp_lock_hint_uncontended = 1 parameter(omp_proc_bind_true=1)
integer (kind=omp_lock_hint_kind), parameter :: omp_lock_hint_contended = 2 integer(kind=omp_proc_bind_kind)omp_proc_bind_master
integer (kind=omp_lock_hint_kind), parameter :: omp_lock_hint_nonspeculative = 4 parameter(omp_proc_bind_master=2)
integer (kind=omp_lock_hint_kind), parameter :: omp_lock_hint_speculative = 8 integer(kind=omp_proc_bind_kind)omp_proc_bind_close
integer (kind=omp_lock_hint_kind), parameter :: kmp_lock_hint_hle = 65536 parameter(omp_proc_bind_close=3)
integer (kind=omp_lock_hint_kind), parameter :: kmp_lock_hint_rtm = 131072 integer(kind=omp_proc_bind_kind)omp_proc_bind_spread
integer (kind=omp_lock_hint_kind), parameter :: kmp_lock_hint_adaptive = 262144 parameter(omp_proc_bind_spread=4)
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_start = 1 integer(kind=omp_lock_hint_kind)omp_lock_hint_none
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_pause = 2 parameter(omp_lock_hint_none=0)
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_flush = 3 integer(kind=omp_lock_hint_kind)omp_lock_hint_uncontended
integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_end = 4 parameter(omp_lock_hint_uncontended=1)
integer(kind=omp_lock_hint_kind)omp_lock_hint_contended
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_notool = -2 parameter(omp_lock_hint_contended=2)
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_nocallback = -1 integer(kind=omp_lock_hint_kind)omp_lock_hint_nonspeculative
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_success = 0 parameter(omp_lock_hint_nonspeculative=4)
integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_ignored = 1 integer(kind=omp_lock_hint_kind)omp_lock_hint_speculative
parameter(omp_lock_hint_speculative=8)
integer(kind=omp_lock_hint_kind)kmp_lock_hint_hle
parameter(kmp_lock_hint_hle=65536)
integer(kind=omp_lock_hint_kind)kmp_lock_hint_rtm
parameter(kmp_lock_hint_rtm=131072)
integer(kind=omp_lock_hint_kind)kmp_lock_hint_adaptive
parameter(kmp_lock_hint_adaptive=262144)
integer(kind=omp_control_tool_kind)omp_control_tool_start
parameter(omp_control_tool_start=1)
integer(kind=omp_control_tool_kind)omp_control_tool_pause
parameter(omp_control_tool_pause=2)
integer(kind=omp_control_tool_kind)omp_control_tool_flush
parameter(omp_control_tool_flush=3)
integer(kind=omp_control_tool_kind)omp_control_tool_end
parameter(omp_control_tool_end=4)
integer(kind=omp_control_tool_result_kind)omp_control_tool_notool
parameter(omp_control_tool_notool=-2)
integer(kind=omp_integer_kind)omp_control_tool_nocallback
parameter(omp_control_tool_nocallback=-1)
integer(kind=omp_control_tool_result_kind)omp_control_tool_success
parameter(omp_control_tool_success=0)
integer(kind=omp_control_tool_result_kind)omp_control_tool_ignored
parameter(omp_control_tool_ignored=1)
interface interface
! *** ! ***
! *** omp_* entry points ! *** omp_* entry points
! *** ! ***
subroutine omp_set_num_threads(num_threads) bind(c) subroutine omp_set_num_threads(num_threads) bind(c)
▲ Show 20 Lines • Show All 588 Lines • Show Last 20 Lines