[PATCH] D82822: [OpenMP][FIX] Consistently use OpenMPIRBuilder if requested

Sun Aug 2 01:24:57 PDT 2020

hoyFB added a comment.

In D82822#2187576 <https://reviews.llvm.org/D82822#2187576>, @jdoerfert wrote:

> @davezarzycki The bots reported this as well, didn't build MLIR locally, this should have been fixed by 4d83aa4771d84940626d86c883193af390812281 <https://reviews.llvm.org/rG4d83aa4771d84940626d86c883193af390812281>

I was seeing the same issue with what @davezarzycki has encountered. Not sure why this is related to MLIR. The failure is cause by this line:

  74: // CHECK-DEBUG-NEXT:    [[OMP_GLOBAL_THREAD_NUM:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* **@12**), !dbg !{{[0-9]*}}

where `@12` is supposed to be defined as

  @11 = private unnamed_addr constant [90 x i8] c";llvm-project/clang/test/OpenMP/irbuilder_nested_parallel_for.c;parallel_for_1;85;1;;\00", align 1
  @12 = private unnamed_addr global %struct.ident_t { i32 0, i32 2, i32 0, i32 0, i8* getelementptr inbounds ([90 x i8], [90 x i8]* @11, i32 0, i32 0) }, align 8

The exact match of `@12` seems a bit fragile to me since global data names could be changed from time to time. Can you please make it bit more robust? Thanks.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D82822/new/

https://reviews.llvm.org/D82822