Skip to content

Commit b7b6eb7

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 9f69850 commit b7b6eb7

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
@@ -366,14 +366,14 @@ endif()
366366
# Building the Fortran module files
367367
# One compilation step creates both omp_lib.mod and omp_lib_kinds.mod
368368
configure_file(${LIBOMP_INC_DIR}/omp_lib.h.var omp_lib.h @ONLY)
369-
configure_file(${LIBOMP_INC_DIR}/omp_lib.F90.var omp_lib.F90 @ONLY)
369+
configure_file(${LIBOMP_INC_DIR}/omp_lib.f90.var omp_lib.f90 @ONLY)
370370

371371
set(BUILD_FORTRAN_MODULES False)
372372
if (NOT ${LIBOMP_FORTRAN_MODULES_COMPILER} STREQUAL "")
373373
# If libomp is built as an LLVM runtime and the flang compiler is available,
374374
# compile the Fortran module files.
375375
message(STATUS "configuring openmp to build Fortran module files using ${LIBOMP_FORTRAN_MODULES_COMPILER}")
376-
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90)
376+
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.f90)
377377
add_custom_target(libomp-mod ALL DEPENDS omp_lib.mod omp_lib_kinds.mod)
378378
add_custom_command(
379379
OUTPUT omp_lib.mod omp_lib_kinds.mod
@@ -393,7 +393,7 @@ elseif(${LIBOMP_FORTRAN_MODULES})
393393
set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Misc")
394394
libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS)
395395
if(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
396-
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90)
396+
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.f90)
397397
else()
398398
message(FATAL_ERROR "Fortran module build requires Fortran 90 compiler")
399399
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
@@ -430,102 +430,82 @@
430430
end subroutine omp_fulfill_event
431431

432432
subroutine omp_init_lock(svar) bind(c)
433-
#ifdef __INTEL_COMPILER
434433
!DIR$ IF(__INTEL_COMPILER.GE.1400)
435434
!DIR$ attributes known_intrinsic :: omp_init_lock
436435
!DIR$ ENDIF
437-
#endif
438436
use omp_lib_kinds
439437
integer (kind=omp_lock_kind) svar
440438
end subroutine omp_init_lock
441439

442440
subroutine omp_destroy_lock(svar) bind(c)
443-
#ifdef __INTEL_COMPILER
444441
!DIR$ IF(__INTEL_COMPILER.GE.1400)
445442
!DIR$ attributes known_intrinsic :: omp_destroy_lock
446443
!DIR$ ENDIF
447-
#endif
448444
use omp_lib_kinds
449445
integer (kind=omp_lock_kind) svar
450446
end subroutine omp_destroy_lock
451447

452448
subroutine omp_set_lock(svar) bind(c)
453-
#ifdef __INTEL_COMPILER
454449
!DIR$ IF(__INTEL_COMPILER.GE.1400)
455450
!DIR$ attributes known_intrinsic :: omp_set_lock
456451
!DIR$ ENDIF
457-
#endif
458452
use omp_lib_kinds
459453
integer (kind=omp_lock_kind) svar
460454
end subroutine omp_set_lock
461455

462456
subroutine omp_unset_lock(svar) bind(c)
463-
#ifdef __INTEL_COMPILER
464457
!DIR$ IF(__INTEL_COMPILER.GE.1400)
465458
!DIR$ attributes known_intrinsic :: omp_unset_lock
466459
!DIR$ ENDIF
467-
#endif
468460
use omp_lib_kinds
469461
integer (kind=omp_lock_kind) svar
470462
end subroutine omp_unset_lock
471463

472464
function omp_test_lock(svar) bind(c)
473-
#ifdef __INTEL_COMPILER
474465
!DIR$ IF(__INTEL_COMPILER.GE.1400)
475466
!DIR$ attributes known_intrinsic :: omp_test_lock
476467
!DIR$ ENDIF
477-
#endif
478468
use omp_lib_kinds
479469
logical (kind=omp_logical_kind) omp_test_lock
480470
integer (kind=omp_lock_kind) svar
481471
end function omp_test_lock
482472

483473
subroutine omp_init_nest_lock(nvar) bind(c)
484-
#ifdef __INTEL_COMPILER
485474
!DIR$ IF(__INTEL_COMPILER.GE.1400)
486475
!DIR$ attributes known_intrinsic :: omp_init_nest_lock
487476
!DIR$ ENDIF
488-
#endif
489477
use omp_lib_kinds
490478
integer (kind=omp_nest_lock_kind) nvar
491479
end subroutine omp_init_nest_lock
492480

493481
subroutine omp_destroy_nest_lock(nvar) bind(c)
494-
#ifdef __INTEL_COMPILER
495482
!DIR$ IF(__INTEL_COMPILER.GE.1400)
496483
!DIR$ attributes known_intrinsic :: omp_destroy_nest_lock
497484
!DIR$ ENDIF
498-
#endif
499485
use omp_lib_kinds
500486
integer (kind=omp_nest_lock_kind) nvar
501487
end subroutine omp_destroy_nest_lock
502488

503489
subroutine omp_set_nest_lock(nvar) bind(c)
504-
#ifdef __INTEL_COMPILER
505490
!DIR$ IF(__INTEL_COMPILER.GE.1400)
506491
!DIR$ attributes known_intrinsic :: omp_set_nest_lock
507492
!DIR$ ENDIF
508-
#endif
509493
use omp_lib_kinds
510494
integer (kind=omp_nest_lock_kind) nvar
511495
end subroutine omp_set_nest_lock
512496

513497
subroutine omp_unset_nest_lock(nvar) bind(c)
514-
#ifdef __INTEL_COMPILER
515498
!DIR$ IF(__INTEL_COMPILER.GE.1400)
516499
!DIR$ attributes known_intrinsic :: omp_unset_nest_lock
517500
!DIR$ ENDIF
518-
#endif
519501
use omp_lib_kinds
520502
integer (kind=omp_nest_lock_kind) nvar
521503
end subroutine omp_unset_nest_lock
522504

523505
function omp_test_nest_lock(nvar) bind(c)
524-
#ifdef __INTEL_COMPILER
525506
!DIR$ IF(__INTEL_COMPILER.GE.1400)
526507
!DIR$ attributes known_intrinsic :: omp_test_nest_lock
527508
!DIR$ ENDIF
528-
#endif
529509
use omp_lib_kinds
530510
integer (kind=omp_integer_kind) omp_test_nest_lock
531511
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
@@ -488,102 +488,82 @@
488488
end subroutine omp_fulfill_event
489489

490490
subroutine omp_init_lock(svar) bind(c)
491-
#ifdef __INTEL_COMPILER
492491
!DIR$ IF(__INTEL_COMPILER.GE.1400)
493492
!DIR$ attributes known_intrinsic :: omp_init_lock
494493
!DIR$ ENDIF
495-
#endif
496494
import
497495
integer (kind=omp_lock_kind) svar
498496
end subroutine omp_init_lock
499497

500498
subroutine omp_destroy_lock(svar) bind(c)
501-
#ifdef __INTEL_COMPILER
502499
!DIR$ IF(__INTEL_COMPILER.GE.1400)
503500
!DIR$ attributes known_intrinsic :: omp_destroy_lock
504501
!DIR$ ENDIF
505-
#endif
506502
import
507503
integer (kind=omp_lock_kind) svar
508504
end subroutine omp_destroy_lock
509505

510506
subroutine omp_set_lock(svar) bind(c)
511-
#ifdef __INTEL_COMPILER
512507
!DIR$ IF(__INTEL_COMPILER.GE.1400)
513508
!DIR$ attributes known_intrinsic :: omp_set_lock
514509
!DIR$ ENDIF
515-
#endif
516510
import
517511
integer (kind=omp_lock_kind) svar
518512
end subroutine omp_set_lock
519513

520514
subroutine omp_unset_lock(svar) bind(c)
521-
#ifdef __INTEL_COMPILER
522515
!DIR$ IF(__INTEL_COMPILER.GE.1400)
523516
!DIR$ attributes known_intrinsic :: omp_unset_lock
524517
!DIR$ ENDIF
525-
#endif
526518
import
527519
integer (kind=omp_lock_kind) svar
528520
end subroutine omp_unset_lock
529521

530522
function omp_test_lock(svar) bind(c)
531-
#ifdef __INTEL_COMPILER
532523
!DIR$ IF(__INTEL_COMPILER.GE.1400)
533524
!DIR$ attributes known_intrinsic :: omp_test_lock
534525
!DIR$ ENDIF
535-
#endif
536526
import
537527
logical (kind=omp_logical_kind) omp_test_lock
538528
integer (kind=omp_lock_kind) svar
539529
end function omp_test_lock
540530

541531
subroutine omp_init_nest_lock(nvar) bind(c)
542-
#ifdef __INTEL_COMPILER
543532
!DIR$ IF(__INTEL_COMPILER.GE.1400)
544533
!DIR$ attributes known_intrinsic :: omp_init_nest_lock
545534
!DIR$ ENDIF
546-
#endif
547535
import
548536
integer (kind=omp_nest_lock_kind) nvar
549537
end subroutine omp_init_nest_lock
550538

551539
subroutine omp_destroy_nest_lock(nvar) bind(c)
552-
#ifdef __INTEL_COMPILER
553540
!DIR$ IF(__INTEL_COMPILER.GE.1400)
554541
!DIR$ attributes known_intrinsic :: omp_destroy_nest_lock
555542
!DIR$ ENDIF
556-
#endif
557543
import
558544
integer (kind=omp_nest_lock_kind) nvar
559545
end subroutine omp_destroy_nest_lock
560546

561547
subroutine omp_set_nest_lock(nvar) bind(c)
562-
#ifdef __INTEL_COMPILER
563548
!DIR$ IF(__INTEL_COMPILER.GE.1400)
564549
!DIR$ attributes known_intrinsic :: omp_set_nest_lock
565550
!DIR$ ENDIF
566-
#endif
567551
import
568552
integer (kind=omp_nest_lock_kind) nvar
569553
end subroutine omp_set_nest_lock
570554

571555
subroutine omp_unset_nest_lock(nvar) bind(c)
572-
#ifdef __INTEL_COMPILER
573556
!DIR$ IF(__INTEL_COMPILER.GE.1400)
574557
!DIR$ attributes known_intrinsic :: omp_unset_nest_lock
575558
!DIR$ ENDIF
576-
#endif
577559
import
578560
integer (kind=omp_nest_lock_kind) nvar
579561
end subroutine omp_unset_nest_lock
580562

581563
function omp_test_nest_lock(nvar) bind(c)
582-
#ifdef __INTEL_COMPILER
583564
!DIR$ IF(__INTEL_COMPILER.GE.1400)
584565
!DIR$ attributes known_intrinsic :: omp_test_nest_lock
585566
!DIR$ ENDIF
586-
#endif
587567
import
588568
integer (kind=omp_integer_kind) omp_test_nest_lock
589569
integer (kind=omp_nest_lock_kind) nvar
@@ -1012,7 +992,6 @@
1012992
end subroutine kmp_set_warnings_off
1013993
end interface
1014994

1015-
#ifdef __INTEL_COMPILER
1016995
!DIR$ IF DEFINED (__INTEL_OFFLOAD)
1017996

1018997
!DIR$ IF(__INTEL_COMPILER.LT.1900)
@@ -1181,4 +1160,3 @@
11811160
!$omp declare target(omp_init_nest_lock_with_hint )
11821161
!DIR$ ENDIF
11831162
!DIR$ ENDIF
1184-
#endif

0 commit comments

Comments
 (0)