Skip to content

Commit cb3d351

Browse files
bryanpkcbryanpkc
committed
Partially revert "[flang][OpenMP] Compile proper omp_lib.mod from the openmp/src/include sources (#80874)"
This partially reverts commit fb5fd2d, in order to remove the use of preprocessor directives in omp_lib.h, which causes the Classic Flang frontend to fail when the including source file is not preprocessed.
1 parent cd605e8 commit cb3d351

File tree

3 files changed

+3
-45
lines changed

3 files changed

+3
-45
lines changed

‎openmp/runtime/src/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,14 +340,14 @@ endif()
340340
# Building the Fortran module files
341341
# One compilation step creates both omp_lib.mod and omp_lib_kinds.mod
342342
configure_file(${LIBOMP_INC_DIR}/omp_lib.h.var omp_lib.h @ONLY)
343-
configure_file(${LIBOMP_INC_DIR}/omp_lib.F90.var omp_lib.F90 @ONLY)
343+
configure_file(${LIBOMP_INC_DIR}/omp_lib.f90.var omp_lib.f90 @ONLY)
344344

345345
set(BUILD_FORTRAN_MODULES False)
346346
if (NOT ${LIBOMP_FORTRAN_MODULES_COMPILER} STREQUAL "")
347347
# If libomp is built as an LLVM runtime and the flang compiler is available,
348348
# compile the Fortran module files.
349349
message(STATUS "configuring openmp to build Fortran module files using ${LIBOMP_FORTRAN_MODULES_COMPILER}")
350-
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90)
350+
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.f90)
351351
add_custom_target(libomp-mod ALL DEPENDS omp_lib.mod omp_lib_kinds.mod)
352352
add_custom_command(
353353
OUTPUT omp_lib.mod omp_lib_kinds.mod
@@ -367,7 +367,7 @@ elseif(${LIBOMP_FORTRAN_MODULES})
367367
set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Misc")
368368
libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS)
369369
if(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
370-
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90)
370+
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.f90)
371371
else()
372372
message(FATAL_ERROR "Fortran module build requires Fortran 90 compiler")
373373
endif()

‎openmp/runtime/src/include/omp_lib.F90.var‎ renamed to ‎openmp/runtime/src/include/omp_lib.f90.var‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -429,102 +429,82 @@
429429
end subroutine omp_fulfill_event
430430

431431
subroutine omp_init_lock(svar) bind(c)
432-
#ifdef __INTEL_COMPILER
433432
!DIR$ IF(__INTEL_COMPILER.GE.1400)
434433
!DIR$ attributes known_intrinsic :: omp_init_lock
435434
!DIR$ ENDIF
436-
#endif
437435
use omp_lib_kinds
438436
integer (kind=omp_lock_kind) svar
439437
end subroutine omp_init_lock
440438

441439
subroutine omp_destroy_lock(svar) bind(c)
442-
#ifdef __INTEL_COMPILER
443440
!DIR$ IF(__INTEL_COMPILER.GE.1400)
444441
!DIR$ attributes known_intrinsic :: omp_destroy_lock
445442
!DIR$ ENDIF
446-
#endif
447443
use omp_lib_kinds
448444
integer (kind=omp_lock_kind) svar
449445
end subroutine omp_destroy_lock
450446

451447
subroutine omp_set_lock(svar) bind(c)
452-
#ifdef __INTEL_COMPILER
453448
!DIR$ IF(__INTEL_COMPILER.GE.1400)
454449
!DIR$ attributes known_intrinsic :: omp_set_lock
455450
!DIR$ ENDIF
456-
#endif
457451
use omp_lib_kinds
458452
integer (kind=omp_lock_kind) svar
459453
end subroutine omp_set_lock
460454

461455
subroutine omp_unset_lock(svar) bind(c)
462-
#ifdef __INTEL_COMPILER
463456
!DIR$ IF(__INTEL_COMPILER.GE.1400)
464457
!DIR$ attributes known_intrinsic :: omp_unset_lock
465458
!DIR$ ENDIF
466-
#endif
467459
use omp_lib_kinds
468460
integer (kind=omp_lock_kind) svar
469461
end subroutine omp_unset_lock
470462

471463
function omp_test_lock(svar) bind(c)
472-
#ifdef __INTEL_COMPILER
473464
!DIR$ IF(__INTEL_COMPILER.GE.1400)
474465
!DIR$ attributes known_intrinsic :: omp_test_lock
475466
!DIR$ ENDIF
476-
#endif
477467
use omp_lib_kinds
478468
logical (kind=omp_logical_kind) omp_test_lock
479469
integer (kind=omp_lock_kind) svar
480470
end function omp_test_lock
481471

482472
subroutine omp_init_nest_lock(nvar) bind(c)
483-
#ifdef __INTEL_COMPILER
484473
!DIR$ IF(__INTEL_COMPILER.GE.1400)
485474
!DIR$ attributes known_intrinsic :: omp_init_nest_lock
486475
!DIR$ ENDIF
487-
#endif
488476
use omp_lib_kinds
489477
integer (kind=omp_nest_lock_kind) nvar
490478
end subroutine omp_init_nest_lock
491479

492480
subroutine omp_destroy_nest_lock(nvar) bind(c)
493-
#ifdef __INTEL_COMPILER
494481
!DIR$ IF(__INTEL_COMPILER.GE.1400)
495482
!DIR$ attributes known_intrinsic :: omp_destroy_nest_lock
496483
!DIR$ ENDIF
497-
#endif
498484
use omp_lib_kinds
499485
integer (kind=omp_nest_lock_kind) nvar
500486
end subroutine omp_destroy_nest_lock
501487

502488
subroutine omp_set_nest_lock(nvar) bind(c)
503-
#ifdef __INTEL_COMPILER
504489
!DIR$ IF(__INTEL_COMPILER.GE.1400)
505490
!DIR$ attributes known_intrinsic :: omp_set_nest_lock
506491
!DIR$ ENDIF
507-
#endif
508492
use omp_lib_kinds
509493
integer (kind=omp_nest_lock_kind) nvar
510494
end subroutine omp_set_nest_lock
511495

512496
subroutine omp_unset_nest_lock(nvar) bind(c)
513-
#ifdef __INTEL_COMPILER
514497
!DIR$ IF(__INTEL_COMPILER.GE.1400)
515498
!DIR$ attributes known_intrinsic :: omp_unset_nest_lock
516499
!DIR$ ENDIF
517-
#endif
518500
use omp_lib_kinds
519501
integer (kind=omp_nest_lock_kind) nvar
520502
end subroutine omp_unset_nest_lock
521503

522504
function omp_test_nest_lock(nvar) bind(c)
523-
#ifdef __INTEL_COMPILER
524505
!DIR$ IF(__INTEL_COMPILER.GE.1400)
525506
!DIR$ attributes known_intrinsic :: omp_test_nest_lock
526507
!DIR$ ENDIF
527-
#endif
528508
use omp_lib_kinds
529509
integer (kind=omp_integer_kind) omp_test_nest_lock
530510
integer (kind=omp_nest_lock_kind) nvar

‎openmp/runtime/src/include/omp_lib.h.var‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -486,102 +486,82 @@
486486
end subroutine omp_fulfill_event
487487

488488
subroutine omp_init_lock(svar) bind(c)
489-
#ifdef __INTEL_COMPILER
490489
!DIR$ IF(__INTEL_COMPILER.GE.1400)
491490
!DIR$ attributes known_intrinsic :: omp_init_lock
492491
!DIR$ ENDIF
493-
#endif
494492
import
495493
integer (kind=omp_lock_kind) svar
496494
end subroutine omp_init_lock
497495

498496
subroutine omp_destroy_lock(svar) bind(c)
499-
#ifdef __INTEL_COMPILER
500497
!DIR$ IF(__INTEL_COMPILER.GE.1400)
501498
!DIR$ attributes known_intrinsic :: omp_destroy_lock
502499
!DIR$ ENDIF
503-
#endif
504500
import
505501
integer (kind=omp_lock_kind) svar
506502
end subroutine omp_destroy_lock
507503

508504
subroutine omp_set_lock(svar) bind(c)
509-
#ifdef __INTEL_COMPILER
510505
!DIR$ IF(__INTEL_COMPILER.GE.1400)
511506
!DIR$ attributes known_intrinsic :: omp_set_lock
512507
!DIR$ ENDIF
513-
#endif
514508
import
515509
integer (kind=omp_lock_kind) svar
516510
end subroutine omp_set_lock
517511

518512
subroutine omp_unset_lock(svar) bind(c)
519-
#ifdef __INTEL_COMPILER
520513
!DIR$ IF(__INTEL_COMPILER.GE.1400)
521514
!DIR$ attributes known_intrinsic :: omp_unset_lock
522515
!DIR$ ENDIF
523-
#endif
524516
import
525517
integer (kind=omp_lock_kind) svar
526518
end subroutine omp_unset_lock
527519

528520
function omp_test_lock(svar) bind(c)
529-
#ifdef __INTEL_COMPILER
530521
!DIR$ IF(__INTEL_COMPILER.GE.1400)
531522
!DIR$ attributes known_intrinsic :: omp_test_lock
532523
!DIR$ ENDIF
533-
#endif
534524
import
535525
logical (kind=omp_logical_kind) omp_test_lock
536526
integer (kind=omp_lock_kind) svar
537527
end function omp_test_lock
538528

539529
subroutine omp_init_nest_lock(nvar) bind(c)
540-
#ifdef __INTEL_COMPILER
541530
!DIR$ IF(__INTEL_COMPILER.GE.1400)
542531
!DIR$ attributes known_intrinsic :: omp_init_nest_lock
543532
!DIR$ ENDIF
544-
#endif
545533
import
546534
integer (kind=omp_nest_lock_kind) nvar
547535
end subroutine omp_init_nest_lock
548536

549537
subroutine omp_destroy_nest_lock(nvar) bind(c)
550-
#ifdef __INTEL_COMPILER
551538
!DIR$ IF(__INTEL_COMPILER.GE.1400)
552539
!DIR$ attributes known_intrinsic :: omp_destroy_nest_lock
553540
!DIR$ ENDIF
554-
#endif
555541
import
556542
integer (kind=omp_nest_lock_kind) nvar
557543
end subroutine omp_destroy_nest_lock
558544

559545
subroutine omp_set_nest_lock(nvar) bind(c)
560-
#ifdef __INTEL_COMPILER
561546
!DIR$ IF(__INTEL_COMPILER.GE.1400)
562547
!DIR$ attributes known_intrinsic :: omp_set_nest_lock
563548
!DIR$ ENDIF
564-
#endif
565549
import
566550
integer (kind=omp_nest_lock_kind) nvar
567551
end subroutine omp_set_nest_lock
568552

569553
subroutine omp_unset_nest_lock(nvar) bind(c)
570-
#ifdef __INTEL_COMPILER
571554
!DIR$ IF(__INTEL_COMPILER.GE.1400)
572555
!DIR$ attributes known_intrinsic :: omp_unset_nest_lock
573556
!DIR$ ENDIF
574-
#endif
575557
import
576558
integer (kind=omp_nest_lock_kind) nvar
577559
end subroutine omp_unset_nest_lock
578560

579561
function omp_test_nest_lock(nvar) bind(c)
580-
#ifdef __INTEL_COMPILER
581562
!DIR$ IF(__INTEL_COMPILER.GE.1400)
582563
!DIR$ attributes known_intrinsic :: omp_test_nest_lock
583564
!DIR$ ENDIF
584-
#endif
585565
import
586566
integer (kind=omp_integer_kind) omp_test_nest_lock
587567
integer (kind=omp_nest_lock_kind) nvar
@@ -1010,7 +990,6 @@
1010990
end subroutine kmp_set_warnings_off
1011991
end interface
1012992

1013-
#ifdef __INTEL_COMPILER
1014993
!DIR$ IF DEFINED (__INTEL_OFFLOAD)
1015994

1016995
!DIR$ IF(__INTEL_COMPILER.LT.1900)
@@ -1179,4 +1158,3 @@
11791158
!$omp declare target(omp_init_nest_lock_with_hint )
11801159
!DIR$ ENDIF
11811160
!DIR$ ENDIF
1182-
#endif

0 commit comments

Comments
 (0)