This is an archive of the discontinued LLVM Phabricator instance.

Differential D87250

[OpenMP] Fix typo in CodeGenFunction::EmitOMPWorksharingLoop (PR46412)
ClosedPublic

Authored by RKSimon on Sep 7 2020, 11:14 AM.

Details

Reviewers
ABataev
doctorpangloss
jdoerfert
Commits
rG58970eb7d1dd: [OpenMP] Fix typo in CodeGenFunction::EmitOMPWorksharingLoop (PR46412)
Summary

Fixes issue noticed by static analysis where we appear to have a copy+paste typo, testing ScheduleKind.M1 twice instead of ScheduleKind.M2.

Diff Detail

Event Timeline

RKSimon created this revision.Sep 7 2020, 11:14 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 7 2020, 11:14 AM
Herald added subscribers: guansong, yaxunl. · View Herald Transcript
RKSimon requested review of this revision.Sep 7 2020, 11:14 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptSep 7 2020, 11:14 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
jdoerfert accepted this revision.Sep 7 2020, 11:32 AM

LGTM thx

This revision is now accepted and ready to land.Sep 7 2020, 11:32 AM
Harbormaster completed remote builds in B70868: Diff 290329.Sep 7 2020, 12:30 PM
doctorpangloss accepted this revision.Sep 7 2020, 12:59 PM
Closed by commit rG58970eb7d1dd: [OpenMP] Fix typo in CodeGenFunction::EmitOMPWorksharingLoop (PR46412) (authored by RKSimon). · Explain WhySep 8 2020, 4:00 AM
This revision was automatically updated to reflect the committed changes.
RKSimon added a commit: rG58970eb7d1dd: [OpenMP] Fix typo in CodeGenFunction::EmitOMPWorksharingLoop (PR46412).

Revision Contents

PathSize
clang/
lib/
CodeGen/
2 lines

Diff 290446

clang/lib/CodeGen/CGStmtOpenMP.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 2,976 Lines • ▼ Show 20 Lines // Emit 'then' code.
bool StaticChunkedOne = RT.isStaticChunked(ScheduleKind.Schedule, bool StaticChunkedOne = RT.isStaticChunked(ScheduleKind.Schedule,
/* Chunked */ Chunk != nullptr) && HasChunkSizeOne && /* Chunked */ Chunk != nullptr) && HasChunkSizeOne &&
isOpenMPLoopBoundSharingDirective(S.getDirectiveKind()); isOpenMPLoopBoundSharingDirective(S.getDirectiveKind());
bool IsMonotonic = bool IsMonotonic =
Ordered || Ordered ||
((ScheduleKind.Schedule == OMPC_SCHEDULE_static || ((ScheduleKind.Schedule == OMPC_SCHEDULE_static ||
ScheduleKind.Schedule == OMPC_SCHEDULE_unknown) && ScheduleKind.Schedule == OMPC_SCHEDULE_unknown) &&
!(ScheduleKind.M1 == OMPC_SCHEDULE_MODIFIER_nonmonotonic || !(ScheduleKind.M1 == OMPC_SCHEDULE_MODIFIER_nonmonotonic ||
ScheduleKind.M1 == OMPC_SCHEDULE_MODIFIER_nonmonotonic)) || ScheduleKind.M2 == OMPC_SCHEDULE_MODIFIER_nonmonotonic)) ||
ScheduleKind.M1 == OMPC_SCHEDULE_MODIFIER_monotonic || ScheduleKind.M1 == OMPC_SCHEDULE_MODIFIER_monotonic ||
ScheduleKind.M2 == OMPC_SCHEDULE_MODIFIER_monotonic; ScheduleKind.M2 == OMPC_SCHEDULE_MODIFIER_monotonic;
if ((RT.isStaticNonchunked(ScheduleKind.Schedule, if ((RT.isStaticNonchunked(ScheduleKind.Schedule,
/* Chunked */ Chunk != nullptr) || /* Chunked */ Chunk != nullptr) ||
StaticChunkedOne) && StaticChunkedOne) &&
!Ordered) { !Ordered) {
JumpDest LoopExit = JumpDest LoopExit =
getJumpDestInCurrentScope(createBasicBlock("omp.loop.exit")); getJumpDestInCurrentScope(createBasicBlock("omp.loop.exit"));
▲ Show 20 Lines • Show All 3,712 Lines • Show Last 20 Lines