Skip to content

Commit 9d38f98

Browse files
jdoerfertjdoerfert
committed
[OpenMPOpt] Validate declaration types against the expected types
Validation of the found runtime library functions declarations types (return and argument types) with the expected types. Reviewed By: jdoerfert Differential Revision: https://reviews.llvm.org/D76058
1 parent 3f51c5d commit 9d38f98

File tree

2 files changed

+110
-18
lines changed

2 files changed

+110
-18
lines changed

‎llvm/lib/Transforms/IPO/OpenMPOpt.cpp‎

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ struct OpenMPOpt {
119119
}
120120

121121
private:
122-
/// Try to delete parallel regions if possible
122+
/// Try to delete parallel regions if possible.
123123
bool deleteParallelRegions() {
124124
const unsigned CallbackCalleeOperand = 2;
125125

@@ -385,6 +385,32 @@ struct OpenMPOpt {
385385
return nullptr;
386386
}
387387

388+
/// Returns true if the function declaration \p F matches the runtime
389+
/// function types, that is, return type \p RTFRetType, and argument types
390+
/// \p RTFArgTypes.
391+
static bool declMatchesRTFTypes(Function *F, Type *RTFRetType,
392+
SmallVector<Type *, 8> &RTFArgTypes) {
393+
// TODO: We should output information to the user (under debug output
394+
// and via remarks).
395+
396+
if (!F)
397+
return false;
398+
if (F->getReturnType() != RTFRetType)
399+
return false;
400+
if (F->arg_size() != RTFArgTypes.size())
401+
return false;
402+
403+
auto RTFTyIt = RTFArgTypes.begin();
404+
for (Argument &Arg : F->args()) {
405+
if (Arg.getType() != *RTFTyIt)
406+
return false;
407+
408+
++RTFTyIt;
409+
}
410+
411+
return true;
412+
}
413+
388414
/// Helper to initialize all runtime function information for those defined in
389415
/// OpenMPKinds.def.
390416
void initializeRuntimeFunctions() {
@@ -415,26 +441,29 @@ struct OpenMPOpt {
415441

416442
#define OMP_RTL(_Enum, _Name, _IsVarArg, _ReturnType, ...) \
417443
{ \
418-
auto &RFI = RFIs[_Enum]; \
419-
RFI.Kind = _Enum; \
420-
RFI.Name = _Name; \
421-
RFI.IsVarArg = _IsVarArg; \
422-
RFI.ReturnType = _ReturnType; \
423-
RFI.ArgumentTypes = SmallVector<Type *, 8>({__VA_ARGS__}); \
424-
RFI.Declaration = M.getFunction(_Name); \
425-
unsigned NumUses = CollectUses(RFI); \
426-
(void)NumUses; \
427-
LLVM_DEBUG({ \
428-
dbgs() << TAG << RFI.Name << (RFI.Declaration ? "" : " not") \
429-
<< " found\n"; \
430-
if (RFI.Declaration) \
431-
dbgs() << TAG << "-> got " << NumUses << " uses in " \
432-
<< RFI.UsesMap.size() << " different functions.\n"; \
433-
}); \
444+
SmallVector<Type *, 8> ArgsTypes({__VA_ARGS__}); \
445+
Function *F = M.getFunction(_Name); \
446+
if (declMatchesRTFTypes(F, _ReturnType , ArgsTypes)) { \
447+
auto &RFI = RFIs[_Enum]; \
448+
RFI.Kind = _Enum; \
449+
RFI.Name = _Name; \
450+
RFI.IsVarArg = _IsVarArg; \
451+
RFI.ReturnType = _ReturnType; \
452+
RFI.ArgumentTypes = std::move(ArgsTypes); \
453+
RFI.Declaration = F; \
454+
unsigned NumUses = CollectUses(RFI); \
455+
(void)NumUses; \
456+
LLVM_DEBUG({ \
457+
dbgs() << TAG << RFI.Name << (RFI.Declaration ? "" : " not") \
458+
<< " found\n"; \
459+
if (RFI.Declaration) \
460+
dbgs() << TAG << "-> got " << NumUses << " uses in " \
461+
<< RFI.UsesMap.size() << " different functions.\n"; \
462+
}); \
463+
} \
434464
}
435465
#include "llvm/Frontend/OpenMP/OMPKinds.def"
436466

437-
// TODO: We should validate the declaration agains the types we expect.
438467
// TODO: We should attach the attributes defined in OMPKinds.def.
439468
}
440469

‎llvm/test/Transforms/OpenMP/rtf_type_checking.ll‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
; RUN: opt -S -openmpopt -stats < %s 2>&1 | FileCheck %s
2+
; REQUIRES: asserts
3+
4+
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
5+
6+
%struct.ident_t = type { i32, i32, i32, i32, i8* }
7+
8+
@.str = private unnamed_addr constant [23 x i8] c";unknown;unknown;0;0;;\00", align 1
9+
@0 = private unnamed_addr global %struct.ident_t { i32 0, i32 2, i32 0, i32 0, i8* getelementptr inbounds ([23 x i8], [23 x i8]* @.str, i32 0, i32 0) }, align 8
10+
@1 = private unnamed_addr global %struct.ident_t { i32 0, i32 322, i32 0, i32 0, i8* getelementptr inbounds ([23 x i8], [23 x i8]* @.str, i32 0, i32 0) }, align 8
11+
12+
define i32 @main() {
13+
entry:
14+
15+
call void (%struct.ident_t*, void (i32*, i32*, ...)*, ...) @__kmpc_fork_call(%struct.ident_t* nonnull @0, void (i32*, i32*, ...)* bitcast (void (i32*, i32*)* @.omp_outlined. to void (i32*, i32*, ...)*))
16+
ret i32 0
17+
}
18+
19+
; Only the last runtime call will be matched due that the rest of the "runtime function" calls
20+
; have some type mismatch compared to the real runtime function. See the check at bottom.
21+
define internal void @.omp_outlined.(i32* noalias %.global_tid., i32* noalias %.bound_tid.) {
22+
entry:
23+
24+
call void @__kmpc_master(%struct.ident_t* nonnull @0)
25+
call void @__kmpc_end_master(%struct.ident_t* nonnull @0, i32 0, i32 0)
26+
call void @__kmpc_barrier(%struct.ident_t* nonnull @1, float 0.0)
27+
call void @omp_get_thread_num()
28+
call void @__kmpc_flush(%struct.ident_t* nonnull @0)
29+
ret void
30+
}
31+
; Fewer arguments than expected in variadic function.
32+
declare !callback !2 void @__kmpc_fork_call(%struct.ident_t*, void (i32*, i32*, ...)*, ...)
33+
34+
; Fewer number of arguments in non variadic function.
35+
declare void @__kmpc_master(%struct.ident_t*)
36+
37+
; Bigger number of arguments in non variadic function.
38+
declare void @__kmpc_end_master(%struct.ident_t*, i32, i32)
39+
40+
; Different argument type than the expected.
41+
declare void @__kmpc_barrier(%struct.ident_t*, float)
42+
43+
; Proper use of runtime function.
44+
declare void @__kmpc_flush(%struct.ident_t*)
45+
46+
; Different return type.
47+
declare void @omp_get_thread_num()
48+
49+
!llvm.module.flags = !{!0}
50+
!llvm.ident = !{!1}
51+
52+
!0 = !{i32 1, !"wchar_size", i32 4}
53+
!1 = !{!"clang"}
54+
!2 = !{!3}
55+
!3 = !{i64 2, i64 -1, i64 -1, i1 true}
56+
; ===-------------------------------------------------------------------------===
57+
; ... Statistics Collected ...
58+
; ===-------------------------------------------------------------------------===
59+
;
60+
; CHECK: 1 cgscc-passmgr - Maximum CGSCCPassMgr iterations on one SCC
61+
; CHECK: 2 openmp-opt{{.*}}Number of OpenMP runtime functions identified
62+
;
63+
; There are two matches since the pass is run once per function.

0 commit comments

Comments
 (0)