[flang][OpenMP] Support lowering parse-tree to MLIR for threadprivate directive

[peixin]

Summary

This supports lowering parse-tree to MLIR for threadprivate directive
following the OpenMP 5.1 [2.21.2] standard. Take the following as an
example:

program m
  integer, save :: i
  !$omp threadprivate(i)
  call sub(i)
  !$omp parallel
    call sub(i)
  !$omp end parallel
end

func.func @_QQmain() {
  %0 = fir.address_of(@_QFEi) : !fir.ref<i32>
  %1 = omp.threadprivate %0 : !fir.ref<i32> -> !fir.ref<i32>
  fir.call @_QPsub(%1) : (!fir.ref<i32>) -> ()
  omp.parallel   {   
    %2 = omp.threadprivate %0 : !fir.ref<i32> -> !fir.ref<i32>
    fir.call @_QPsub(%2) : (!fir.ref<i32>) -> ()
    omp.terminator
  }
  return
}

A threadprivate operation (omp.threadprivate) is created for all
references to a threadprivate variable. The runtime will appropriately
return a threadprivate var (%1 as above) or its copy (%2 as above)
depending on whether it is outside or inside a parallel region. For
threadprivate access outside the parallel region, the threadprivate
operation is created in instantiateVar. Inside the parallel region, it
is created in createBodyOfOp.

One new utility function collectSymbolSet is created for collecting
all the variables with a property within a evaluation, which may be one
Fortran, or OpenMP, or OpenACC construct.

[peixin]

For omp-threadprivate-4.f90 and omp-threadprivate-5.f90 (lowering for pointer and allocatable variables), I got the following error when running flang-new -fc1 -emit-llvm -fopenmp. When applying this patch in fir-dev branch, there is no this error.

error: loc("./omp-threadprivate-5.f90":8:29): 'llvm.mlir.global' op initializer region type '!llvm.ptr<struct<(ptr<i32>, i64, i32, i8, i8, i8, i8)>>' does not match global type '!llvm.struct<(ptr<i32>, i64, i32, i8, i8, i8, i8)>'
error: loc("./omp-threadprivate-5.f90":9:30): 'llvm.mlir.global' op initializer region type '!llvm.ptr<struct<(ptr<f32>, i64, i32, i8, i8, i8, i8)>>' does not match global type '!llvm.struct<(ptr<f32>, i64, i32, i8, i8, i8, i8)>'
error: loc("./omp-threadprivate-5.f90":8:23): 'llvm.mlir.global' op initializer region type '!llvm.ptr<struct<(ptr<i32>, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>>' does not match global type '!llvm.struct<(ptr<i32>, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>'
error: loc("./omp-threadprivate-5.f90":9:24): 'llvm.mlir.global' op initializer region type '!llvm.ptr<struct<(ptr<f32>, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>>' does not match global type '!llvm.struct<(ptr<f32>, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)>'
error: Lowering to LLVM IR failed
error: loc("./omp-threadprivate-5.f90":8:29): cannot be converted to LLVM IR: missing `LLVMTranslationDialectInterface` registration for dialect for op: builtin.unrealized_conversion_cast
error: loc("./omp-threadprivate-5.f90":8:29): unemittable constant value
error: failed to create the LLVM module

Does anyone know what's going on here? Is it because some work has not been upstreamed?

[peixin]

Remove the split-file check since the IR check fails sometimes for multiple runs. It always succeeds with correct running output if not checking the specific IR with the specific order.

[peixin]

Disable 128-bit integer test on windows since it is not supported there.

[shraiysh]

Thanks for this patch. I have a few comments and questions.

For the naming of tests, I'd like them to be descriptive of "what they test" instead of 1,2,3... but I do not have a strong opinion on this. Thoughts?

flang/lib/Lower/OpenMP.cpp

81

Please add a comment here describing what this function does.

101

Please add a comment here describing what this function does.

119

Same as below: this function doesn't do much and its uses can be easily replaced with converter.getSymbolAddress(). Can we please do that?

123

I am having trouble understanding what this function is doing. Why are we generating a thread private op when the assert checks for already existing thread private op? Are there two threadprivate ops for each symbol?

124

nit: spelling - symOrThreadprivateValue?

730

this function doesn't seem to do much and is only used at two places. Can we use converter.getSymbolAddress() in those uses?

mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp

66

Do we need RegionLessWithResultsOpConversion and RegionLessOpConversion both? Would it be okay if we have one RegionLessOpConversion (that works like current RegionLessWithResultsOpConversion)? Would that cause a compilation issue?

[peixin]

@shraiysh First of all, thanks for the detailed review.

The threadprivate directive is one data-sharing related directive. Other OpenMP constructs/clauses code currently in OpenMP.cpp only needs the result of the expression if there is one expression in the contructs/clauses, so mlir Value is enough. In semantics, the threadprivate changes the definition of the variables, so the extended value is needed for one specific language (here I mean fir::ExtendedValue for fortran code), which results in additional and more complex handling on data entity than other contructs/clauses. This has something in common with private/firstprivate clauses. The common block in private/firstprivate has not been supported, and it will needs some additional process similar to this patch. All in all, this patch borrows some code from FIR lowering, in which it usually use the function names or variable names comment itself. For these code, I don't add comments since it's pretty common in FIR lowering. I only add some comments for the special handling of threadprivate variables, which is no in the lowering of the usual fortran variables.

Please feel free to share your thoughts which needs further comments if some code is hard to understand. @kiranchandramohan can help double check. The final target is to add necessary comments and not to add the redundant comments such as the comment repeating the function name.

For the naming of tests, I'd like them to be descriptive of "what they test" instead of 1,2,3... but I do not have a strong opinion on this. Thoughts?

I did that at the beginning, but it results in very long file name as I supports more and more data types and variable usage cases.

omp-threadprivate-2.f90 -> omp-threadprivate-real-logical-complex-derivedtype.f90
omp-threadprivate-4.f90 -> omp-threadprivate-noncharacter-nonSAVEd-nonInit-scalar.f90

So, I add what is testing in the comment of the file. This is pretty common for fortran test cases. Check flang/test/Lower/io-statement-1/2/3.f90.

flang/lib/Lower/OpenMP.cpp

81

I use the function name to comment itself. "genCommonMember" -> "generate the member of the common block"

101

I use the function name to comment itself. "getExtValue" -> "get the extended value"

119

This and converter.getSymbolAddress() have different argument types.

123

This code is in the function threadPrivateVars, which is called in createBodyOfOp. This is generating one explicit threadprivate op in parallel region.

Are there two threadprivate ops for each symbol?

Yes. But they are in different scope. This code has the similar function as allocate for private clause (createHostAssociateVarClone in Bridge.cpp).

124

No. This is symOriThreadprivateValue, i.e., the original threadprivate value of the symbol. As explained above, this is generating a new and second threadprivate op.

730

I can refactor this code and add one new function getSymbolAddress with different argument type when it gets three according to "Rule of Three" (code duplication). It seems that the lowering of copyin clause will also need this, I can refactor this at that time. I am working on that.

mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp

66

Yes, I tried to use RegionLessOpConversion, but I got compilation error since there is no result in atomic read/write operations. curOp.getType() fails for them. Adding one empty result in atomic read/write op should work, but it seems kind of strange to do that.

[rriddle]

mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp

66

Can't you get around that by converting all of the result types instead of anchoring on getType() (using ->getResultTypes())? For the zero-result case the result type range should just be empty, for the single result there would of course be one.

[peixin]

Replace using getType with using getResultTypes.

[peixin]

mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp

66

Thanks. It works and get fixed.

[rriddle]

mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp

61–65

Sorry, this is what I meant before. This removes any assumptions about number of types.

[peixin]

Replace using converType with using convertTypes.

[peixin]

Fix the clang format issue reported in debian.

[shraiysh]

Thanks for your patience and addressing the comments. It is a big patch and I am trying my best to understand and review it as soon as possible. I will review the test cases soon.

In D124226#3470253, @peixin wrote:

@shraiysh First of all, thanks for the detailed review.

The threadprivate directive is one data-sharing related directive. Other OpenMP constructs/clauses code currently in OpenMP.cpp only needs the result of the expression if there is one expression in the contructs/clauses, so mlir Value is enough. In semantics, the threadprivate changes the definition of the variables, so the extended value is needed for one specific language (here I mean fir::ExtendedValue for fortran code), which results in additional and more complex handling on data entity than other contructs/clauses. This has something in common with private/firstprivate clauses. The common block in private/firstprivate has not been supported, and it will needs some additional process similar to this patch. All in all, this patch borrows some code from FIR lowering, in which it usually use the function names or variable names comment itself. For these code, I don't add comments since it's pretty common in FIR lowering. I only add some comments for the special handling of threadprivate variables, which is no in the lowering of the usual fortran variables.

Please feel free to share your thoughts which needs further comments if some code is hard to understand. @kiranchandramohan can help double check. The final target is to add necessary comments and not to add the redundant comments such as the comment repeating the function name.

I didn't know what we meant by an "extended value" but if the comments are just going to be function names, I guess we can avoid that :)

For the naming of tests, I'd like them to be descriptive of "what they test" instead of 1,2,3... but I do not have a strong opinion on this. Thoughts?

I did that at the beginning, but it results in very long file name as I supports more and more data types and variable usage cases.

omp-threadprivate-2.f90 -> omp-threadprivate-real-logical-complex-derivedtype.f90
omp-threadprivate-4.f90 -> omp-threadprivate-noncharacter-nonSAVEd-nonInit-scalar.f90

So, I add what is testing in the comment of the file. This is pretty common for fortran test cases. Check flang/test/Lower/io-statement-1/2/3.f90.

Is there any issue with long file names as long as they are descriptive but not complete sentences. On the another hand, can we add all the relevant tests in one file, and separate them using comments describing each of them individually? (like loop.f90 in D124277).

Also, the tests for this minor change are huge. This is primarily because these tests try to check four things at once - thus making it integration/regression test instead of unit test. A test failure in such a scenario does not help us much. A suggestion - can we please divide the tests into individual stages so that they are more targeted and provide helpful feedback in case of failures:

• flang/test/Lower/OpenMP/*.f90 - check generation of FIR and OpenMPDialect only (these tests would be added in this patch)
• flang/test/Fir/convert-to-llvm.fir - check FIR to LLVM IR Dialect only.
• mlir/test/Target/LLVMIR/llvmir.mlir - Check LLVM IR Dialect to LLVM IR
• mlir/test/Target/LLVMIR/openmp-llvm.mlir - check OpenMP Dialect to LLVM IR

Only the first kind of tests are required to be added in this patch, and maybe upto LLVM Dialect, but beyond that, it just makes the test lengthy and hard to understand. We can however discuss about having some integration tests separate from unit tests (am open to ideas about this).

[shraiysh]

flang/lib/Lower/OpenMP.cpp

119

I tried replacing the uses of this function with converter.getSymbolAddress and ninja check-flang passed for all tests. Am I missing something?

123

Okay understood. Thanks

124

Okay, I misread it.

730

It is not just about the code duplication, this function is simply replacing getSymbolAddress <-> converter.getSymbolAddress. If it is absolutely necessary to use this lambda, it would be very unfortunate and we should comment why a simple replacement could not work.

[peixin]

Is there any issue with long file names as long as they are descriptive but not complete sentences. On the another hand, can we add all the relevant tests in one file, and separate them using comments describing each of them individually? (like loop.f90 in D124277).

Any of them is OK to me. I guess there is no strict rule for adding test cases. Usually, I followed one of the previous provided test cases.

Also, the tests for this minor change are huge. This is primarily because these tests try to check four things at once - thus making it integration/regression test instead of unit test. A test failure in such a scenario does not help us much. A suggestion - can we please divide the tests into individual stages so that they are more targeted and provide helpful feedback in case of failures:

flang/test/Lower/OpenMP/*.f90 - check generation of FIR and OpenMPDialect only (these tests would be added in this patch)
flang/test/Fir/convert-to-llvm.fir - check FIR to LLVM IR Dialect only.
mlir/test/Target/LLVMIR/llvmir.mlir - Check LLVM IR Dialect to LLVM IR
mlir/test/Target/LLVMIR/openmp-llvm.mlir - check OpenMP Dialect to LLVM IR
Only the first kind of tests are required to be added in this patch, and maybe upto LLVM Dialect, but beyond that, it just makes the test lengthy and hard to understand. We can however discuss about having some integration tests separate from unit tests (am open to ideas about this).

You propose one good question here. When I join the OpenMP development group, I was told to follow the following process:

1. OMPIRBuilder: unittest and IR check for clang
2. MLIR Op Def: check dialect
3. lowering from MLIR to LLVMIR: check MLIR to LLVMIR
4. lowering from parse-tree to MLIR: check end-to-end (was using bbc and tco)

Is there one rule to add the test cases? @kiranchandramohan

I think there is benefit to check end-to-end in step 4. When I develop the code for ordered clause, I found several bugs about work-sharing loop lowering since the end-to-end testing is missed. Usually, the MLIR check cannot have full combination tests, especially for data-related constructs/clauses. Of course, we can add them all, but it takes much more time to add the test cases there. I guess checking end-to-end was in step 4 using bbc and tco since it is the least time-consuming work.

flang/lib/Lower/OpenMP.cpp

101

// Get the extended value for \p val by extracting additional variable information from \p base.

Is this reasonable to you? @shraiysh

119

Well, I didn't try that. Usually I try to pass the same type argument when I use those provided functions in case CI gives one warning-to-error problem. Let me try this and test if CI can pass.

[peixin]

(like loop.f90 in D124277).

https://reviews.llvm.org/D124277#3473895. Andrzej prefers multiple files. Everyone has their own preference :).

[awarzynski]

In D124226#3473962, @peixin wrote:

(like loop.f90 in D124277).

https://reviews.llvm.org/D124277#3473895. Andrzej prefers multiple files. Everyone has their own preference :).

In D124277, I suggested multiple files as that particular file is already quite dense and to me DO and DO WHILE are different enough to merit a dedicated file each :) There is no harm in doing that, it will make the test files more specialised and potentially make testing faster (e.g. "do_loop.f90" and "do_while_loop.f90" can be run in parallel).

In general, I do prefer test files that:

• Test one thing that can be uniquely determined through the file name (within reason, file name can be/should be complemented with comments inside every file). In general, it really helps when it is immediately clear "what" is being tested in a particular file.
• Make triaging failures easy (good labels really help, so does MLIR's -split-input-file). For example, when you see a buildbot failure (especially if you are unfamiliar with the failing code), descriptive file names like "omp-threadprivate-real-logical-complex-derivedtype.f90" (instead of e.g. "omp-threadprivate-2.f90") can make a huge difference.
• Avoid covering too many loosely related cases. In many situations, one failing case in a file means that no other cases in that particular file are being tested (one test case failing = whole file is failing).

In practice, easier said than done! And you will have slightly different priorities in different scenarios.

This is pretty common for fortran test cases. Check flang/test/Lower/io-statement-1/2/3.f90.

I don't find this naming scheme to be particularly helpful - there is no way to understand the difference between these files without opening and reading them. I really wish we avoided that.

On a related note - if you feel that test file names are too long, then all OpenMP test files could drop the leading "omp-". Since the test files are located in "flang/test/Lower/OpenMP/" (i.e. it's clear these are OpenMP tests), having the "omp-" prefix adds no new information. As for "omp-threadprivate-real-logical-complex-derivedtype.f90" vs "omp-threadprivate-2.f90" - how about "threadprivate-different-types.f90"? IIUC, that file is about testing threadprivate with different types. Is listing the types in the filename necessary? I don't mind, but if you want to make the file name shorter then there are various ways to achieve that while keeping the name quite informative.

[peixin]

@awarzynski Thanks for the explanations. Good to hear someone has the strong reason to make the test cases standard. It is also more reasonable for me to give one descriptive file name.

threadprivate-different-types.f90 doesn't represent its true intention. I will use threadprivate-real-logical-complex-derivedtype.f90 if no one opposes the long file name. Will also fix other file names.

[kiranchandramohan]

In D124226#3473930, @peixin wrote:

Is there any issue with long file names as long as they are descriptive but not complete sentences. On the another hand, can we add all the relevant tests in one file, and separate them using comments describing each of them individually? (like loop.f90 in D124277).

Any of them is OK to me. I guess there is no strict rule for adding test cases. Usually, I followed one of the previous provided test cases.

Also, the tests for this minor change are huge. This is primarily because these tests try to check four things at once - thus making it integration/regression test instead of unit test. A test failure in such a scenario does not help us much. A suggestion - can we please divide the tests into individual stages so that they are more targeted and provide helpful feedback in case of failures:

flang/test/Lower/OpenMP/*.f90 - check generation of FIR and OpenMPDialect only (these tests would be added in this patch)
flang/test/Fir/convert-to-llvm.fir - check FIR to LLVM IR Dialect only.
mlir/test/Target/LLVMIR/llvmir.mlir - Check LLVM IR Dialect to LLVM IR
mlir/test/Target/LLVMIR/openmp-llvm.mlir - check OpenMP Dialect to LLVM IR
Only the first kind of tests are required to be added in this patch, and maybe upto LLVM Dialect, but beyond that, it just makes the test lengthy and hard to understand. We can however discuss about having some integration tests separate from unit tests (am open to ideas about this).

You propose one good question here. When I join the OpenMP development group, I was told to follow the following process:

1. OMPIRBuilder: unittest and IR check for clang
2. MLIR Op Def: check dialect
3. lowering from MLIR to LLVMIR: check MLIR to LLVMIR
4. lowering from parse-tree to MLIR: check end-to-end (was using bbc and tco)

Is there one rule to add the test cases? @kiranchandramohan

I think there is benefit to check end-to-end in step 4. When I develop the code for ordered clause, I found several bugs about work-sharing loop lowering since the end-to-end testing is missed. Usually, the MLIR check cannot have full combination tests, especially for data-related constructs/clauses. Of course, we can add them all, but it takes much more time to add the test cases there. I guess checking end-to-end was in step 4 using bbc and tco since it is the least time-consuming work.

These were the steps followed initially when we were gaining experience with the working of flang, mlir, openmpirbuilder. Having all of them in a single place helped to understand/prove that it all works. And as @peixin says it can help uncover bugs and missing steps (like adding the operation to the openmp-to-llvm conversion pass) and forces the developer to write the tests. I guess it is easier to write tests from source to LLVM IR than from FIR+OpenMP to LLVM IR. While for other dialects, the LLVM dialect is a good stop, this is not the case for us due to our slightly different flow (involving the OpenMPIRBuilder). So I think it is good to check the LLVM IR also. But I agree with @shraiysh that having all these in a single test makes the test difficult to read.

I think we can restrict the Lower directory to check for parse-tree to MLIR (FIR + OpenMP) in line with FIR lowering and move the rest to a different directory (flang/test/Integration/OpenMPLLVM) which will be fortran+openmp to OpenMP+LLVMDialect and LLVM IR. Now that we have some execution support, we should also have some execution tests somewhere (https://github.com/llvm/llvm-test-suite).

In D124226#3474072, @awarzynski wrote:

In D124226#3473962, @peixin wrote:

(like loop.f90 in D124277).

https://reviews.llvm.org/D124277#3473895. Andrzej prefers multiple files. Everyone has their own preference :).

In D124277, I suggested multiple files as that particular file is already quite dense and to me DO and DO WHILE are different enough to merit a dedicated file each :) There is no harm in doing that, it will make the test files more specialised and potentially make testing faster (e.g. "do_loop.f90" and "do_while_loop.f90" can be run in parallel).

In general, I do prefer test files that:

• Test one thing that can be uniquely determined through the file name (within reason, file name can be/should be complemented with comments inside every file). In general, it really helps when it is immediately clear "what" is being tested in a particular file.
• Make triaging failures easy (good labels really help, so does MLIR's -split-input-file). For example, when you see a buildbot failure (especially if you are unfamiliar with the failing code), descriptive file names like "omp-threadprivate-real-logical-complex-derivedtype.f90" (instead of e.g. "omp-threadprivate-2.f90") can make a huge difference.
• Avoid covering too many loosely related cases. In many situations, one failing case in a file means that no other cases in that particular file are being tested (one test case failing = whole file is failing).

In practice, easier said than done! And you will have slightly different priorities in different scenarios.

This is pretty common for fortran test cases. Check flang/test/Lower/io-statement-1/2/3.f90.

I don't find this naming scheme to be particularly helpful - there is no way to understand the difference between these files without opening and reading them. I really wish we avoided that.

On a related note - if you feel that test file names are too long, then all OpenMP test files could drop the leading "omp-". Since the test files are located in "flang/test/Lower/OpenMP/" (i.e. it's clear these are OpenMP tests), having the "omp-" prefix adds no new information. As for "omp-threadprivate-real-logical-complex-derivedtype.f90" vs "omp-threadprivate-2.f90" - how about "threadprivate-different-types.f90"? IIUC, that file is about testing threadprivate with different types. Is listing the types in the filename necessary? I don't mind, but if you want to make the file name shorter then there are various ways to achieve that while keeping the name quite informative.

The omp prefix for tests was because they were initially in the Lower directory with the other FIR tests. When we moved it to the OpenMP directory we did not remove the prefix. Feel free to remove it.
In general, we should balance how much information can be added to a file name vs adding the same information clearly as a comment in the test. I don't have a strong opinion.

[peixin]

1. Remove getSymbolAddress.
2. Change the file names.
3. Split the test cases.

[clementval]

In D124226#3474232, @kiranchandramohan wrote:

These were the steps followed initially when we were gaining experience with the working of flang, mlir, openmpirbuilder. Having all of them in a single place helped to understand/prove that it all works. And as @peixin says it can help uncover bugs and missing steps (like adding the operation to the openmp-to-llvm conversion pass) and forces the developer to write the tests. I guess it is easier to write tests from source to LLVM IR than from FIR+OpenMP to LLVM IR. While for other dialects, the LLVM dialect is a good stop, this is not the case for us due to our slightly different flow (involving the OpenMPIRBuilder). So I think it is good to check the LLVM IR also. But I agree with @shraiysh that having all these in a single test makes the test difficult to read.

I think we can restrict the Lower directory to check for parse-tree to MLIR (FIR + OpenMP) in line with FIR lowering and move the rest to a different directory (flang/test/Integration/OpenMPLLVM) which will be fortran+openmp to OpenMP+LLVMDialect and LLVM IR. Now that we have some execution support, we should also have some execution tests somewhere (https://github.com/llvm/llvm-test-suite).

It was mentioned to me in a patch for OpenACC that it is not desirable to have end to end tests (or Fortran to LLVM-IR). Test should test a single component (Fortran to FIR, FIR to LLVM IR).

[awarzynski]

In D124226#3474102, @peixin wrote:

@awarzynski Thanks for the explanations. Good to hear someone has the strong reason to make the test cases standard. It is also more reasonable for me to give one descriptive file name.

threadprivate-different-types.f90 doesn't represent its true intention. I will use threadprivate-real-logical-complex-derivedtype.f90 if no one opposes the long file name. Will also fix other file names.

+1

In D124226#3474504, @clementval wrote:

It was mentioned to me in a patch for OpenACC that it is not desirable to have end to end tests (or Fortran to LLVM-IR). Test should test a single component (Fortran to FIR, FIR to LLVM IR).

Was that "end-to-end _instead_ of component-based tests" or "end-to-end _on top of_ component-based tests"? I agree that first and foremost we ought to be adding minimal tests for every component separately. I'm not opposed to supplementing them with more holistic/integration tests. However, I would appreciate some justification that would explain what is gained by testing multiple components (perhaps there's something that cannot be tested otherwise?).

In D124226#3474232, @kiranchandramohan wrote:

I think we can restrict the Lower directory to check for parse-tree to MLIR (FIR + OpenMP) in line with FIR lowering.

+1

[clementval]

In D124226#3474623, @awarzynski wrote:

In D124226#3474102, @peixin wrote:

@awarzynski Thanks for the explanations. Good to hear someone has the strong reason to make the test cases standard. It is also more reasonable for me to give one descriptive file name.

Was that "end-to-end _instead_ of component-based tests" or "end-to-end _on top of_ component-based tests"? I agree that first and foremost we ought to be adding minimal tests for every component separately. I'm not opposed to supplementing them with more holistic/integration tests. However, I would appreciate some justification that would explain what is gained by testing multiple components (perhaps there's something that cannot be tested otherwise?).

end-to-end test are normally hosted in the llvm-test-suite and not directly here. component based tests makes debugging easier and point directly to the failing component.

[peixin]

It was mentioned to me in a patch for OpenACC that it is not desirable to have end to end tests (or Fortran to LLVM-IR). Test should test a single component (Fortran to FIR, FIR to LLVM IR).

@clementval I like this strategy. To be honest, adding so many LLVM IR checks really takes time and I really don't like to do it.

However, I would appreciate some justification that would explain what is gained by testing multiple components (perhaps there's something that cannot be tested otherwise?).

@awarzynski Some bugs are hidden without end-to-end test. For example, I found these two (D120294 and D116073) when doing end-to-end test. For D120294, it is not easy to write such one complex mlir test case without translated from fortran, so it was not tested and the bug is hidden. For D116073, the operation arguments type may have mismatch if not carefully handled.

Anyway, it is ok to me that we only make components test in patch. The bugs can be filed to issues when testing locally. I would rather create one issue like this (https://github.com/flang-compiler/f18-llvm-project/issues/1136) to show what I have tested than writing so many LLVM IR checks. For this, I only need to copy and paste what I tested locally. In addition, reading the source code is easier and testing running results is more useful. Also, writing one LLVM IR check for use association is not easy.

One more problem here is how to test the code in mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp? Previously, it was tested by end-to-end test for OpenMP test cases.

[peixin]

One more problem here is how to test the code in mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp? Previously, it was tested by end-to-end test for OpenMP test cases.

Well, I find the place to test it. FIR team uses flang/test/Fir to test FIR to LLVMIR with tco or fir-opt. There was no OpenMP test there. We can add the test cases under flang/test/Fir/OpenMP/threadprivate-op.mlir to test the operation conversion. Or better directory name or place. @kiranchandramohan @shraiysh What do you think? Do we need end-to-end test here?

[clementval]

There are tests in mlir/test/Target/LLVMIR/openmp-llvm.mlir. I guess if it is to test FIR/OpenMP integration then of course it makes sense to have where FIR is.

[shraiysh]

In my opinion, these tests belongs to MLIR since the OpenMP is a core dialect. It is supposed to be usable by other frontend than Flang.

I agree with this. They test (LLVM IR Dialect + OpenMP Dialect) to LLVM IR. If we accurately test F90 to (OpenMP Dialect + FIR Dialect) and (FIR Dialect + OpenMP Dialect) to (LLVM IR Dialect + OpenMP Dialect) then we probably would not need any other tests (except the end-to-end/execution tests hosted in the llvm test suite).

Previously, it was tested by end-to-end test for OpenMP test cases.

https://github.com/llvm/llvm-project/blob/main/mlir/test/Target/LLVMIR/openmp-llvm.mlir tests for them.

[peixin]

In my opinion, these tests belongs to MLIR since the OpenMP is a core dialect. It is supposed to be usable by other frontend than Flang.

That's true. But the problem is there seems no tool can test it currently. Only Flang uses OpenMP dialect for now?

https://github.com/llvm/llvm-project/blob/main/mlir/test/Target/LLVMIR/openmp-llvm.mlir tests for them.

It is not. As we can see, the test for atomic read/write and threadprivate are sucessful in openmp-llvm.mlir without changes in OpenMPToLLVM.cpp. The code in mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp needs to be tested by tco or fir-opt, which are both under flang. For example, the code is tested for atomic read/write using fir-opt in D122725.

[peixin]

There are tests in mlir/test/Target/LLVMIR/openmp-llvm.mlir. I guess if it is to test FIR/OpenMP integration then of course it makes sense to have where FIR is.

mlir/test/Target/LLVMIR/openmp-llvm.mlir is used to test translation from MLIR to LLVM IR. There was no FIR. The code under mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp is used to translate OpenMP MLIR (in language side, here I mean Fortran) into OpenMP MLIR (in MLIR side). For threadprivate, it is mainly for type conversion of arguments and results.

[shraiysh]

It is not. As we can see, the test for atomic read/write and threadprivate are sucessful in openmp-llvm.mlir without changes in OpenMPToLLVM.cpp. The code in mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp needs to be tested by tco or fir-opt, which are both under flang. For example, the code is tested for atomic read/write using fir-opt in D122725.

Hmm, this is a strange situation, the tests for changes in mlir/ should reside under mlir/ and not under flang/. I think we can add tests for such changes by adding tests for these while converting OpenMP Dialect + X-dialect (any other dialect) to OpenMP Dialect + LLVM Dialect in mlir/. @rriddle @ftynse what would be the best place/combination of dialects for testing the code in mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp?

[peixin]

OpenMP Dialect + FIR-Dialect  -> OpenMP Dialect + LLVM Dialect
 (flang side, FIR data type)        (mlir side, LLVM data type)

BTW, these two OpenMP Dialect have minor differences, mainly data type? Currently, this translation is tested in flang side by using tco or fir-opt.

[kiranchandramohan]

In D124226#3476532, @shraiysh wrote:

It is not. As we can see, the test for atomic read/write and threadprivate are sucessful in openmp-llvm.mlir without changes in OpenMPToLLVM.cpp. The code in mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp needs to be tested by tco or fir-opt, which are both under flang. For example, the code is tested for atomic read/write using fir-opt in D122725.

Hmm, this is a strange situation, the tests for changes in mlir/ should reside under mlir/ and not under flang/. I think we can add tests for such changes by adding tests for these while converting OpenMP Dialect + X-dialect (any other dialect) to OpenMP Dialect + LLVM Dialect in mlir/. @rriddle @ftynse what would be the best place/combination of dialects for testing the code in mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp?

Usually these are tested in https://github.com/llvm/llvm-project/blob/main/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir. But i think in the atomic operation and the threadprivate case there is currently no conversion from the memref to LLVM dialect that is suitable for OpenMP dialect. If there is such a conversion then it can be tested in https://github.com/llvm/llvm-project/blob/main/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir.

[kiranchandramohan]

In D124226#3476548, @peixin wrote:

OpenMP Dialect + FIR-Dialect  -> OpenMP Dialect + LLVM Dialect
 (flang side, FIR data type)        (mlir side, LLVM data type)

BTW, these two OpenMP Dialect have minor differences, mainly data type? Currently, this translation is tested in flang side by using tco or fir-opt.

This can be achieved by FIR to LLVM Dialect conversion tests + OpenMPToLLVM conversion tests. There are similar examples in OpenACC.
https://github.com/llvm/llvm-project/blob/4a8c13a6f42e9c58af64421790509cc58208859b/mlir/test/Conversion/OpenACCToLLVM/convert-data-operands-to-llvmir.mlir#L8
https://github.com/flang-compiler/f18-llvm-project/pull/915/commits/e0a401d1490084880e468ef7b7693c2712631f5f#diff-99ef956db9470e0f2d2c079bbd6efa99698fd01d738ceef9fc422946062a3900

[kiranchandramohan]

There are some integration tests in MLIR that seems to be switched OFF by default and only enabled by building with a CMake option. There is probably a CI somewhere testing it. This could possibly be an option for us.
https://discourse.llvm.org/t/vectorops-rfc-add-suite-of-integration-tests-for-vector-dialect-operations/1213

[peixin]

This can be achieved by FIR to LLVM Dialect conversion tests + OpenMPToLLVM conversion tests. There are similar examples in OpenACC.
https://github.com/llvm/llvm-project/blob/4a8c13a6f42e9c58af64421790509cc58208859b/mlir/test/Conversion/OpenACCToLLVM/convert-data-operands-to-llvmir.mlir#L8
https://github.com/flang-compiler/f18-llvm-project/pull/915/commits/e0a401d1490084880e468ef7b7693c2712631f5f#diff-99ef956db9470e0f2d2c079bbd6efa99698fd01d738ceef9fc422946062a3900

This sounds more reasonable. And I know why this patch fails for pointer/allocatables when lowering to LLVM IR by running tco, but it succeeds in fir-dev. There are still some important patches not upstreamed.

[peixin]

Even we can support integration test here, threadprivate-pointer-allocatable.f90 still needs some patches upstreamed to take the integration test. Also, this patch blocks the review for the lowering of default clause and the development of the copyin clause. Considering the type conversion things has not been fully upstreamed, can I change this patch to only support lowering parse-tree to MLIR for threadprivate? At that time, we can follow the style of what OpenACC does.

[kiranchandramohan]

In D124226#3476752, @peixin wrote:

Even we can support integration test here, threadprivate-pointer-allocatable.f90 still needs some patches upstreamed to take the integration test. Also, this patch blocks the review for the lowering of default clause and the development of the copyin clause. Considering the type conversion things has not been fully upstreamed, can I change this patch to only support lowering parse-tree to MLIR for threadprivate? At that time, we can follow the style of what OpenACC does.

Sure that is fine with me.

[peixin]

Remove the operation conversion. Will support it after the upstream is done.

[peixin]

Update this since the depend patch is updated.

[schweitz]

If you want to write a Fortran with OpenMP test that tests more of the pipeline, say to LLVM IR, then flang/test/Driver seems to be one possibility of where to put such a test. That directory is not just driver tests, but more a sundry of tests.

[peixin]

In D124226#3477399, @schweitz wrote:

If you want to write a Fortran with OpenMP test that tests more of the pipeline, say to LLVM IR, then flang/test/Driver seems to be one possibility of where to put such a test. That directory is not just driver tests, but more a sundry of tests.

I look through the tests under flang/test/Driver, but adding OpenMP integration tests there seems not appropriate. As @clementval suggested, adding component tests in llvm-project and adding the execution tests in https://github.com/llvm/llvm-test-suite in future seems more resonable.

[awarzynski]

In D124226#3479018, @peixin wrote:

I look through the tests under flang/test/Driver, but adding OpenMP integration tests there seems not appropriate.

I agree. Every test file in that directory is meant to verify a particular driver functionality. As the driver integrates various components, some tests may feel like these are end-to-end or integration tests. The goal, however, is just to test the driver.

As @clementval suggested, adding component tests in llvm-project and adding the execution tests in https://github.com/llvm/llvm-test-suite in future seems more resonable.

+1.

As a more general suggestion, I would really appreciate an RFC for this. The idea of "end-to-end" tests was brought up in the past (see e.g. https://discourse.llvm.org/t/flang-test-questions), but we never reached a conclusion. It is still unclear to me whether we actually need integration tests for this change. To me, that's a workflow question for OpenMP development and I feel that we are digressing here a bit. If this patch is for "lowering", then that's only one component for me and there should only be tests for lowering. Also, apart from llvm-test-suite, there's cross-project-tests too.

[peixin]

@awarzynski Thanks for the suggestions. Let's move this discussion to D124610. I would like to push forward this patch for only lowering work so that we can move on other OpenMP works based on this patch.

[awarzynski]

In D124226#3479937, @peixin wrote:

@awarzynski Thanks for the suggestions. Let's move this discussion to D124610. I would like to push forward this patch for only lowering work so that we can move on other OpenMP works based on this patch.

SGTM, thanks!

[peixin]

rebase and ping

[peixin]

ping @kiranchandramohan @jeanPerier @schweitz

[peixin]

rebase

[peixin]

rebase and ping

[kiranchandramohan]

Thanks @peixin for this work and apologise that reviewing this patch is delayed for a long time. Mostly LG. Requesting adding several comments, a refactoring (if possible), and pushing out a portion of this patch into another one.

I would recommend adding some more information into the summary of the patch, like with an example like the one below. Also briefly mention the following,
-> A threadprivate operation is created for all references to a threadprivate variable. The runtime will appropriately return a threadprivate var or its copy depending on whether it is outside or inside a parallel region.
-> For threadprivate access outside the parallel region, the threadprivate operation is created in instantiateVar.
-> Inside the parallel region, it is created in createBodyOfOp.
-> A few utility functions are created. e.g for collecting all the variables with a property.

integer, save :: i
!$omp threadprivate(i)
call sb(i)
!$omp parallel
call sb(i)
!$omp end parallel
end

func.func @_QQmain() {
  %0 = fir.address_of(@_QFEi) : !fir.ref<i32>
  %1 = omp.threadprivate %0 : !fir.ref<i32> -> !fir.ref<i32>
  fir.call @_QPsb(%1) : (!fir.ref<i32>) -> ()
  omp.parallel   {
    %2 = omp.threadprivate %0 : !fir.ref<i32> -> !fir.ref<i32>
    fir.call @_QPsb(%2) : (!fir.ref<i32>) -> ()
    omp.terminator
  }
  return
}

flang/include/flang/Lower/AbstractConverter.h

81

Nit: Would spelling out be better? getSymbolExtendedValue.

flang/lib/Lower/OpenMP.cpp

81

Nit: Would genCommonBlockMember be better?

81

Nit: I assume this shares some common code with other places where common block members are accessed like instantiateCommon in ConvertVariable.cpp and possibly in other places too. Can we do some refactoring to share the code? If not can you add a comment similar to instantiateCommon?

101

Nit: Would getExtendedValue be better? The description sounds good to me. Do you know whether additional handling is required for strings?
Is this function specially made for the threadprivate case or is it generally usable?

121

Nit: Can you add a comment here saying that in this function we get the original ThreadPrivateOp corresponding to the symbol and use the appropriate field from that Operation to create the threadprivate Copy operation inside the parallel region?

126

Is this the same as op->sym_addr() ?

136

Nit: Can you add a comment explaining why we have to do some additional steps (like binding the Symbol) for commonblocks?

748

Can we add this else if in a follow up patch? It will simplify this patch.

[peixin]

Address the comments.

[peixin]

Thanks @kiranchandramohan for the comments. Addressed them all.

flang/include/flang/Lower/AbstractConverter.h

81

Fixed.

flang/lib/Lower/OpenMP.cpp

81

The instantiateCommon has multiple purposes which stops me reusing that here. Add some comment. In the long term, the instantiateCommon may be split into multiple small functions when supporting more fortran features. So also add one FIXME here.

81

Yes, fixed.

101

Yes, fixed the function name.

The additional handling is not required for non-pointer non-allocatable strings. For pointer or allocatable strings, box,nonDeferredLenParams() is used to get the non deferred length info.

This function is designed targeting for general usage. I assume future data-related construct or clauses may need this such as declare target construct. Of course, this function may be refactored to support more functions such as mutable properties.

126

Thanks for the notice. Fixed it since sym_addr is more readable.

136

Done.

748

Sure. Good point. Single-function patch is easier to review and maintain.

[kiranchandramohan]

Can you check the behaviour in a nested OpenMP region, like the following?

PROGRAM MAIN
INTEGER, SAVE :: A
!$OMP THREADPRIVATE(A)
!$OMP PARALLEL
PRINT *, A
!$OMP DO
DO I=1,100
 PRINT *, A
END DO
!$OMP END DO
!$OMP END PARALLEL
END PROGRAM

You might need a change from,

if (std::is_same_v<Op, omp::ParallelOp>)
  threadPrivatizeVars(converter, eval);

to something like

if(std::is_same_v<Op, omp::ParallelOp> || getRegion().getParentOfType<mlir::omp::ParallelOp>())
  threadPrivatizeVars(converter, eval);

[peixin]

In D124226#3559674, @kiranchandramohan wrote:

Can you check the behaviour in a nested OpenMP region, like the following?

PROGRAM MAIN
INTEGER, SAVE :: A
!$OMP THREADPRIVATE(A)
!$OMP PARALLEL
PRINT *, A
!$OMP DO
DO I=1,100
 PRINT *, A
END DO
!$OMP END DO
!$OMP END PARALLEL
END PROGRAM

You might need a change from,

if (std::is_same_v<Op, omp::ParallelOp>)
  threadPrivatizeVars(converter, eval);

to something like

if(std::is_same_v<Op, omp::ParallelOp> || getRegion().getParentOfType<mlir::omp::ParallelOp>())
  threadPrivatizeVars(converter, eval);

The generated FIR is as follows:

func.func @_QQmain() {
  %0 = fir.address_of(@_QFEa) : !fir.ref<i32>
  %1 = omp.threadprivate %0 : !fir.ref<i32> -> !fir.ref<i32>
  %2 = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFEi"}
  omp.parallel   {
    %3 = fir.alloca i32 {adapt.valuebyref, pinned}
    %4 = omp.threadprivate %0 : !fir.ref<i32> -> !fir.ref<i32>
    ...
    %8 = fir.load %4 : !fir.ref<i32>
    %9 = fir.call @_FortranAioOutputInteger32(%7, %8) : (!fir.ref<i8>, i32) -> i1
    omp.wsloop   for  (%arg0) : i32 = (%c1_i32) to (%c100_i32) inclusive step (%c1_i32_0) {
      fir.store %arg0 to %3 : !fir.ref<i32>
      ...
      %14 = fir.load %4 : !fir.ref<i32>
      %15 = fir.call @_FortranAioOutputInteger32(%13, %14) : (!fir.ref<i8>, i32) -> i1
      omp.yield
    }
    omp.terminator
  }
  return
}

It seems to be correct. The threadprivate runtime call is only related to the thread. It gets the value of varaibles according to the thread info in the runtime library. For the worksharing loop, it assigns multiple threads into the loops. But in implementation for the runtime call such as __kmpc_for_static_init_4u, it stores and gets the loop info (such as index) according to the thread info in the runtime library. All in all, the thread info is in the runtime library, so the openmp runtime calls can be implemented independently. Please let me know if I understand incorrectly?

Check the following example:

PROGRAM MAIN
  use omp_lib
  INTEGER, SAVE :: A
  !$OMP THREADPRIVATE(A)
  !$OMP PARALLEL num_threads(10)
  A = omp_get_thread_num()
  !$OMP DO
  DO I=1,10
   PRINT *, "index = ", I, ", threadprivate value = ", A
  END DO
  !$OMP END DO
  !$OMP END PARALLEL
END PROGRAM

$ flang-new -fopenmp -flang-experimental-exec test.f90 && ./a.out index =  1, threadprivate value =  0
 index =  7, threadprivate value =  6
 index =  6, threadprivate value =  5
 index =  5, threadprivate value =  4
 index =  9, threadprivate value =  8
 index =  3, threadprivate value =  2
 index =  8, threadprivate value =  7
 index =  2, threadprivate value =  1
 index =  4, threadprivate value =  3
 index =  10, threadprivate value =  9

[kiranchandramohan]

Thanks @peixin for the clarification. Due to some reason, I thought that the threadprivate operation is not created if the threadprivate variable is not directly accessed in the immediate parallel region.

What about the following case where the threadprivate access is inside a function called in the parallel region?

PROGRAM MAIN
  use omp_lib
  INTEGER, SAVE :: A
  !$OMP THREADPRIVATE(A)
  !$OMP PARALLEL
  call sub()
  !$OMP end parallel
contains
  subroutine sub
  !$omp do
  DO I=1,10
   A = omp_get_thread_num()
   print *, I, A
  END DO
  !$OMP END do
  end subroutine
END PROGRAM

[peixin]

In D124226#3560009, @kiranchandramohan wrote:

Thanks @peixin for the clarification. Due to some reason, I thought that the threadprivate operation is not created if the threadprivate variable is not directly accessed in the immediate parallel region.

What about the following case where the threadprivate access is inside a function called in the parallel region?

PROGRAM MAIN
  use omp_lib
  INTEGER, SAVE :: A
  !$OMP THREADPRIVATE(A)
  !$OMP PARALLEL
  call sub()
  !$OMP end parallel
contains
  subroutine sub
  !$omp do
  DO I=1,10
   A = omp_get_thread_num()
   print *, I, A
  END DO
  !$OMP END do
  end subroutine
END PROGRAM

You hit one good example. This is the host-association threadprivate variable, which is not supported yet. Check https://github.com/flang-compiler/f18-llvm-project/issues/1136#issuecomment-1070900183. To support host assocation threadprivate variable, it will requires some changes in FIR lowering. I will delay it after I know some more about FIR lowering. Anyway, it definitely should be in one single patch since it will need some discussion with FIR team.

[peixin]

@kiranchandramohan BTW, only common block is allowed in threadprivate in OMP 1.0. And the common block is most commonly used in threadprivate directive. So it's no hurry to support host-association threadprivate variable.

[kiranchandramohan]

Thanks @peixin for the explanation and detailed testing. Yes, we can handle host-association in a separate patch. In general, for OpenMP we might have some issues there.

LGTM. You can submit after a day if there are no further requests for change.

flang/include/flang/Lower/AbstractConverter.h

 //===----------------------------------------------------------------------===//
 
 #ifndef FORTRAN_LOWER_ABSTRACTCONVERTER_H
 #define FORTRAN_LOWER_ABSTRACTCONVERTER_H
 
 #include "flang/Common/Fortran.h"
 #include "flang/Lower/PFTDefs.h"
 #include "flang/Optimizer/Builder/BoxValue.h"
+#include "flang/Semantics/symbol.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "llvm/ADT/ArrayRef.h"
 
 namespace fir {
 class KindMapping;
 class FirOpBuilder;
 } // namespace fir
 

 public:
   //===--------------------------------------------------------------------===//
   // Symbols
   //===--------------------------------------------------------------------===//
 
   /// Get the mlir instance of a symbol.
   virtual mlir::Value getSymbolAddress(SymbolRef sym) = 0;
 
+  virtual fir::ExtendedValue
+  getSymbolExtValue(const Fortran::semantics::Symbol &sym) = 0;
+
   /// Get the binding of an implied do variable by name.
   virtual mlir::Value impliedDoBinding(llvm::StringRef name) = 0;
 
   /// Copy the binding of src to target symbol.
   virtual void copySymbolBinding(SymbolRef src, SymbolRef target) = 0;
 
   /// Binds the symbol to an fir extended value. The symbol binding will be
   /// added or replaced at the inner-most level of the local symbol map.
   virtual void bindSymbol(SymbolRef sym, const fir::ExtendedValue &exval) = 0;
 
   /// Get the label set associated with a symbol.
   virtual bool lookupLabelSet(SymbolRef sym, pft::LabelSet &labelSet) = 0;
 
   /// Get the code defined by a label
   virtual pft::Evaluation *lookupLabel(pft::Label label) = 0;
 
   /// For a given symbol which is host-associated, create a clone using
   /// parameters from the host-associated symbol.
   virtual bool
   createHostAssociateVarClone(const Fortran::semantics::Symbol &sym) = 0;
 
   virtual void copyHostAssociateVar(const Fortran::semantics::Symbol &sym) = 0;
 
+  /// Collect the set of symbols flagged as \p flag in \p eval region.
+  virtual void collectSymbolSet(
+      pft::Evaluation &eval,
+      llvm::SetVector<const Fortran::semantics::Symbol *> &symbolSet,
+      Fortran::semantics::Symbol::Flag flag) = 0;
+
   //===--------------------------------------------------------------------===//
   // Expressions
   //===--------------------------------------------------------------------===//
 
   /// Generate the address of the location holding the expression, someExpr.
   virtual fir::ExtendedValue genExprAddr(const SomeExpr &, StatementContext &,
                                          mlir::Location *loc = nullptr) = 0;
   /// Generate the address of the location holding the expression, someExpr

flang/include/flang/Lower/OpenMP.h

 } // namespace parser
 
 namespace lower {
 
 class AbstractConverter;
 
 namespace pft {
 struct Evaluation;
+struct Variable;
 } // namespace pft
 
 void genOpenMPConstruct(AbstractConverter &, pft::Evaluation &,
                         const parser::OpenMPConstruct &);
 void genOpenMPDeclarativeConstruct(AbstractConverter &, pft::Evaluation &,
                                    const parser::OpenMPDeclarativeConstruct &);
+void genThreadprivateOp(AbstractConverter &, const pft::Variable &);
 
 } // namespace lower
 } // namespace Fortran
 
 #endif // FORTRAN_LOWER_OPENMP_H

flang/include/flang/Lower/PFTBuilder.h

return node.parent.visit(common::visitors{
       [](auto &p) -> ParentType * { return getAncestor<ParentType>(p); }});
 }
 
 /// Call the provided \p callBack on all symbols that are referenced inside \p
 /// funit.
 void visitAllSymbols(const FunctionLikeUnit &funit,
                      std::function<void(const semantics::Symbol &)> callBack);
 
+/// Call the provided \p callBack on all symbols that are referenced inside \p
+/// eval region.
+void visitAllSymbols(const Evaluation &eval,
+                     std::function<void(const semantics::Symbol &)> callBack);
+
 } // namespace Fortran::lower::pft
 
 namespace Fortran::lower {
 /// Create a PFT (Pre-FIR Tree) from the parse tree.
 ///
 /// A PFT is a light weight tree over the parse tree that is used to create FIR.
 /// The PFT captures pointers back into the parse tree, so the parse tree must
 /// not be changed between the construction of the PFT and its last use.  The

flang/lib/Lower/Bridge.cpp

public:
   //===--------------------------------------------------------------------===//
   // AbstractConverter overrides
   //===--------------------------------------------------------------------===//
 
   mlir::Value getSymbolAddress(Fortran::lower::SymbolRef sym) override final {
     return lookupSymbol(sym).getAddr();
   }
 
+  fir::ExtendedValue
+  getSymbolExtValue(const Fortran::semantics::Symbol &sym) override final {
+    Fortran::lower::SymbolBox sb = localSymbols.lookupSymbol(sym);
+    assert(sb && "symbol box not found");
+    return sb.toExtendedValue();
+  }
+
   mlir::Value impliedDoBinding(llvm::StringRef name) override final {
     mlir::Value val = localSymbols.lookupImpliedDo(name);
     if (!val)
       fir::emitFatalError(toLocation(), "ac-do-variable has no binding");
     return val;
   }
 
   void copySymbolBinding(Fortran::lower::SymbolRef src,
if (auto seqTy = symType.dyn_cast<fir::SequenceType>()) {
       builder->create<fir::StoreOp>(loc, loadVal, fir::getBase(exv));
     }
   }
 
   //===--------------------------------------------------------------------===//
   // Utility methods
   //===--------------------------------------------------------------------===//
 
+  void collectSymbolSet(
+      Fortran::lower::pft::Evaluation &eval,
+      llvm::SetVector<const Fortran::semantics::Symbol *> &symbolSet,
+      Fortran::semantics::Symbol::Flag flag) override final {
+    auto addToList = [&](const Fortran::semantics::Symbol &sym) {
+      const Fortran::semantics::Symbol &ultimate = sym.GetUltimate();
+      if (ultimate.test(flag))
+        symbolSet.insert(&ultimate);
+    };
+    Fortran::lower::pft::visitAllSymbols(eval, addToList);
+  }
+
   mlir::Location getCurrentLocation() override final { return toLocation(); }
 
   /// Generate a dummy location.
   mlir::Location genUnknownLocation() override final {
     // Note: builder may not be instantiated yet
     return mlir::UnknownLoc::get(&getMLIRContext());
   }
 
void mapDummiesAndResults(Fortran::lower::pft::FunctionLikeUnit &funit,
     }
   }
 
   /// Instantiate variable \p var and add it to the symbol map.
   /// See ConvertVariable.cpp.
   void instantiateVar(const Fortran::lower::pft::Variable &var,
                       Fortran::lower::AggregateStoreMap &storeMap) {
     Fortran::lower::instantiateVariable(*this, var, localSymbols, storeMap);
+    if (var.hasSymbol() &&
+        var.getSymbol().test(
+            Fortran::semantics::Symbol::Flag::OmpThreadprivate))
+      Fortran::lower::genThreadprivateOp(*this, var);
   }
 
   /// Prepare to translate a new function
   void startNewFunction(Fortran::lower::pft::FunctionLikeUnit &funit) {
     assert(!builder && "expected nullptr");
     Fortran::lower::CalleeInterface callee(funit, *this);
     mlir::func::FuncOp func = callee.addEntryBlockAndMapArguments();
     builder = new fir::FirOpBuilder(func, bridge.getKindMap());

flang/lib/Lower/OpenMP.cpp

if (const auto &privateClause =
                    std::get_if<Fortran::parser::OmpClause::Firstprivate>(
                        &clause.u)) {
       createPrivateVarSyms(converter, firstPrivateClause);
     }
   }
   firOpBuilder.restoreInsertionPoint(insPt);
 }
 
+static mlir::Value genCommonMember(Fortran::lower::AbstractConverter &converter,
+                                   const Fortran::semantics::Symbol &sym,
+                                   mlir::Value commonValue) {
+  auto &firOpBuilder = converter.getFirOpBuilder();
+  mlir::Location currentLocation = converter.getCurrentLocation();
+  mlir::IntegerType i8Ty = firOpBuilder.getIntegerType(8);
+  mlir::Type i8Ptr = firOpBuilder.getRefType(i8Ty);
+  mlir::Type seqTy = firOpBuilder.getRefType(firOpBuilder.getVarLenSeqTy(i8Ty));
+  mlir::Value base =
+      firOpBuilder.createConvert(currentLocation, seqTy, commonValue);
+  std::size_t byteOffset = sym.GetUltimate().offset();
+  mlir::Value offs = firOpBuilder.createIntegerConstant(
+      currentLocation, firOpBuilder.getIndexType(), byteOffset);
+  mlir::Value varAddr = firOpBuilder.create<fir::CoordinateOp>(
+      currentLocation, i8Ptr, base, mlir::ValueRange{offs});
+  mlir::Type symType = converter.genType(sym);
+  return firOpBuilder.createConvert(currentLocation,
+                                    firOpBuilder.getRefType(symType), varAddr);
+}
+
+static fir::ExtendedValue getExtValue(fir::ExtendedValue base,
+                                      mlir::Value val) {
+  return base.match(
+      [&](const fir::MutableBoxValue &box) -> fir::ExtendedValue {
+        return fir::MutableBoxValue(val, box.nonDeferredLenParams(), {});
+      },
+      [&](const auto &) -> fir::ExtendedValue {
+        return fir::substBase(base, val);
+      });
+}
+
+static void threadPrivatizeVars(Fortran::lower::AbstractConverter &converter,
+                                Fortran::lower::pft::Evaluation &eval) {
+  auto &firOpBuilder = converter.getFirOpBuilder();
+  mlir::Location currentLocation = converter.getCurrentLocation();
+  auto insPt = firOpBuilder.saveInsertionPoint();
+  firOpBuilder.setInsertionPointToStart(firOpBuilder.getAllocaBlock());
+
+  auto genThreadprivateOp = [&](Fortran::lower::SymbolRef sym) -> mlir::Value {
+    mlir::Value symOriThreadprivateValue = converter.getSymbolAddress(sym);
+    mlir::Operation *op = symOriThreadprivateValue.getDefiningOp();
+    assert(mlir::isa<mlir::omp::ThreadprivateOp>(op) &&
+           "The threadprivate operation not created");
+    mlir::Value symValue = op->getOperand(0);
+    return firOpBuilder.create<mlir::omp::ThreadprivateOp>(
+        currentLocation, symValue.getType(), symValue);
+  };
+
+  llvm::SetVector<const Fortran::semantics::Symbol *> threadprivateSyms;
+  converter.collectSymbolSet(
+      eval, threadprivateSyms,
+      Fortran::semantics::Symbol::Flag::OmpThreadprivate);
+
+  llvm::SetVector<const Fortran::semantics::Symbol *> commonSyms;
+  for (std::size_t i = 0; i < threadprivateSyms.size(); i++) {
+    auto sym = threadprivateSyms[i];
+    mlir::Value symThreadprivateValue;
+    if (const Fortran::semantics::Symbol *common =
+            Fortran::semantics::FindCommonBlockContaining(sym->GetUltimate())) {
+      mlir::Value commonThreadprivateValue;
+      if (commonSyms.contains(common)) {
+        commonThreadprivateValue = converter.getSymbolAddress(*common);
+      } else {
+        commonThreadprivateValue = genThreadprivateOp(*common);
+        converter.bindSymbol(*common, commonThreadprivateValue);
+        commonSyms.insert(common);
+      }
+      symThreadprivateValue =
+          genCommonMember(converter, *sym, commonThreadprivateValue);
+    } else {
+      symThreadprivateValue = genThreadprivateOp(*sym);
+    }
+
+    fir::ExtendedValue sexv = converter.getSymbolExtValue(*sym);
+    fir::ExtendedValue symThreadprivateExv =
+        getExtValue(sexv, symThreadprivateValue);
+    converter.bindSymbol(*sym, symThreadprivateExv);
+  }
+
+  firOpBuilder.restoreInsertionPoint(insPt);
+}
+
 static void genObjectList(const Fortran::parser::OmpObjectList &objectList,
                           Fortran::lower::AbstractConverter &converter,
                           llvm::SmallVectorImpl<Value> &operands) {
   auto addOperands = [&](Fortran::lower::SymbolRef sym) {
     const mlir::Value variable = converter.getSymbolAddress(sym);
     if (variable) {
       operands.push_back(variable);
     } else {
std::visit(Fortran::common::visitors{
                    }},
                ompObject.u);
   }
 }
 
 template <typename Op>
 static void
 createBodyOfOp(Op &op, Fortran::lower::AbstractConverter &converter,
-               mlir::Location &loc,
+               mlir::Location &loc, Fortran::lower::pft::Evaluation &eval,
                const Fortran::parser::OmpClauseList *clauses = nullptr,
                bool outerCombined = false) {
   fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
   firOpBuilder.createBlock(&op.getRegion());
   auto &block = op.getRegion().back();
   firOpBuilder.setInsertionPointToStart(&block);
   // Ensure the block is well-formed.
   firOpBuilder.create<mlir::omp::TerminatorOp>(loc);
   // Reset the insertion point to the start of the first block.
   firOpBuilder.setInsertionPointToStart(&block);
   // Handle privatization. Do not privatize if this is the outer operation.
   if (clauses && !outerCombined)
     privatizeVars(converter, *clauses);
+
+  if (std::is_same_v<Op, omp::ParallelOp>)
+    threadPrivatizeVars(converter, eval);
 }
 
 static void genOMP(Fortran::lower::AbstractConverter &converter,
                    Fortran::lower::pft::Evaluation &eval,
                    const Fortran::parser::OpenMPSimpleStandaloneConstruct
                        &simpleStandaloneConstruct) {
   const auto &directive =
       std::get<Fortran::parser::OmpSimpleStandaloneDirective>(
genOMP(Fortran::lower::AbstractConverter &converter,
 
   if (blockDirective.v == llvm::omp::OMPD_parallel) {
     // Create and insert the operation.
     auto parallelOp = firOpBuilder.create<mlir::omp::ParallelOp>(
         currentLocation, argTy, ifClauseOperand, numThreadsClauseOperand,
         allocateOperands, allocatorOperands, /*reduction_vars=*/ValueRange(),
         /*reductions=*/nullptr, procBindKindAttr);
     createBodyOfOp<omp::ParallelOp>(parallelOp, converter, currentLocation,
-                                    &opClauseList, /*isCombined=*/false);
+                                    eval, &opClauseList, /*isCombined=*/false);
   } else if (blockDirective.v == llvm::omp::OMPD_master) {
     auto masterOp =
         firOpBuilder.create<mlir::omp::MasterOp>(currentLocation, argTy);
-    createBodyOfOp<omp::MasterOp>(masterOp, converter, currentLocation);
+    createBodyOfOp<omp::MasterOp>(masterOp, converter, currentLocation, eval);
   } else if (blockDirective.v == llvm::omp::OMPD_single) {
     auto singleOp = firOpBuilder.create<mlir::omp::SingleOp>(
         currentLocation, allocateOperands, allocatorOperands, nowaitAttr);
-    createBodyOfOp<omp::SingleOp>(singleOp, converter, currentLocation);
+    createBodyOfOp<omp::SingleOp>(singleOp, converter, currentLocation, eval);
   } else if (blockDirective.v == llvm::omp::OMPD_ordered) {
     auto orderedOp = firOpBuilder.create<mlir::omp::OrderedRegionOp>(
         currentLocation, /*simd=*/nullptr);
-    createBodyOfOp<omp::OrderedRegionOp>(orderedOp, converter, currentLocation);
+    createBodyOfOp<omp::OrderedRegionOp>(orderedOp, converter, currentLocation,
+                                         eval);
   } else {
     TODO(converter.getCurrentLocation(), "Unhandled block directive");
   }
 }
 
 static void
 genOMP(Fortran::lower::AbstractConverter &converter,
        Fortran::lower::pft::Evaluation &eval,
if (name.empty()) {
       if (!global)
         global = modBuilder.create<mlir::omp::CriticalDeclareOp>(
             currentLocation, name, hint);
       return firOpBuilder.create<mlir::omp::CriticalOp>(
           currentLocation, mlir::FlatSymbolRefAttr::get(
                                firOpBuilder.getContext(), global.sym_name()));
     }
   }();
-  createBodyOfOp<omp::CriticalOp>(criticalOp, converter, currentLocation);
+  createBodyOfOp<omp::CriticalOp>(criticalOp, converter, currentLocation, eval);
 }
 
 static void
 genOMP(Fortran::lower::AbstractConverter &converter,
        Fortran::lower::pft::Evaluation &eval,
        const Fortran::parser::OpenMPSectionConstruct &sectionConstruct) {
 
   auto &firOpBuilder = converter.getFirOpBuilder();
   auto currentLocation = converter.getCurrentLocation();
   mlir::omp::SectionOp sectionOp =
       firOpBuilder.create<mlir::omp::SectionOp>(currentLocation);
-  createBodyOfOp<omp::SectionOp>(sectionOp, converter, currentLocation);
+  createBodyOfOp<omp::SectionOp>(sectionOp, converter, currentLocation, eval);
 }
 
 // TODO: Add support for reduction
 static void
 genOMP(Fortran::lower::AbstractConverter &converter,
        Fortran::lower::pft::Evaluation &eval,
        const Fortran::parser::OpenMPSectionsConstruct &sectionsConstruct) {
   auto &firOpBuilder = converter.getFirOpBuilder();
llvm::omp::Directive dir =
           .v;
 
   // Parallel Sections Construct
   if (dir == llvm::omp::Directive::OMPD_parallel_sections) {
     auto parallelOp = firOpBuilder.create<mlir::omp::ParallelOp>(
         currentLocation, /*if_expr_var*/ nullptr, /*num_threads_var*/ nullptr,
         allocateOperands, allocatorOperands, /*reduction_vars=*/ValueRange(),
         /*reductions=*/nullptr, /*proc_bind_val*/ nullptr);
-    createBodyOfOp(parallelOp, converter, currentLocation);
+    createBodyOfOp(parallelOp, converter, currentLocation, eval);
     auto sectionsOp = firOpBuilder.create<mlir::omp::SectionsOp>(
         currentLocation, /*reduction_vars*/ ValueRange(),
         /*reductions=*/nullptr, /*allocate_vars*/ ValueRange(),
         /*allocators_vars*/ ValueRange(), /*nowait=*/nullptr);
-    createBodyOfOp(sectionsOp, converter, currentLocation);
+    createBodyOfOp(sectionsOp, converter, currentLocation, eval);
 
     // Sections Construct
   } else if (dir == llvm::omp::Directive::OMPD_sections) {
     auto sectionsOp = firOpBuilder.create<mlir::omp::SectionsOp>(
         currentLocation, reductionVars, /*reductions = */ nullptr,
         allocateOperands, allocatorOperands, noWaitClauseOperand);
-    createBodyOfOp<omp::SectionsOp>(sectionsOp, converter, currentLocation);
+    createBodyOfOp<omp::SectionsOp>(sectionsOp, converter, currentLocation,
+                                    eval);
   }
 }
 
 static void genOmpAtomicHintAndMemoryOrderClauses(
     Fortran::lower::AbstractConverter &converter,
     const Fortran::parser::OmpAtomicClauseList &clauseList,
     mlir::IntegerAttr &hint,
     mlir::omp::ClauseMemoryOrderKindAttr &memory_order) {
std::visit(
           [&](const Fortran::parser::OpenMPCriticalConstruct
                   &criticalConstruct) {
             genOMP(converter, eval, criticalConstruct);
           },
       },
       ompConstruct.u);
 }
 
+void Fortran::lower::genThreadprivateOp(
+    Fortran::lower::AbstractConverter &converter,
+    const Fortran::lower::pft::Variable &var) {
+  fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
+  mlir::Location currentLocation = converter.getCurrentLocation();
+
+  const Fortran::semantics::Symbol &sym = var.getSymbol();
+  mlir::Value symThreadprivateValue;
+  if (const Fortran::semantics::Symbol *common =
+          Fortran::semantics::FindCommonBlockContaining(sym.GetUltimate())) {
+    mlir::Value commonValue = converter.getSymbolAddress(*common);
+    if (mlir::isa<mlir::omp::ThreadprivateOp>(commonValue.getDefiningOp())) {
+      // Generate ThreadprivateOp for a common block instead of its members and
+      // only do it once for a common block.
+      return;
+    }
+    // Generate ThreadprivateOp and rebind the common block.
+    mlir::Value commonThreadprivateValue =
+        firOpBuilder.create<mlir::omp::ThreadprivateOp>(
+            currentLocation, commonValue.getType(), commonValue);
+    converter.bindSymbol(*common, commonThreadprivateValue);
+    // Generate the threadprivate value for the common block member.
+    symThreadprivateValue =
+        genCommonMember(converter, sym, commonThreadprivateValue);
+  } else if (!var.isGlobal()) {
+    // Non-global variable which can be in threadprivate directive must be one
+    // variable in main program, and it has implicit SAVE attribute. Take it as
+    // with SAVE attribute, so to create GlobalOp for it to simplify the
+    // translation to LLVM IR.
+    mlir::Type ty = converter.genType(sym);
+    std::string globalName = converter.mangleName(sym);
+    mlir::StringAttr linkage = firOpBuilder.createInternalLinkage();
+    fir::GlobalOp global =
+        firOpBuilder.createGlobal(currentLocation, ty, globalName, linkage);
+
+    auto createInit = [&](std::function<void(fir::FirOpBuilder &)> genInit) {
+      mlir::Region &region = global.getRegion();
+      region.push_back(new mlir::Block);
+      mlir::Block &block = region.back();
+      auto insertPt = firOpBuilder.saveInsertionPoint();
+      firOpBuilder.setInsertionPointToStart(&block);
+      genInit(firOpBuilder);
+      firOpBuilder.restoreInsertionPoint(insertPt);
+    };
+
+    // Create default initialization for non-character scalar.
+    if (Fortran::semantics::IsAllocatableOrPointer(sym)) {
+      mlir::Type baseAddrType = ty.dyn_cast<fir::BoxType>().getEleTy();
+      createInit([&](fir::FirOpBuilder &b) {
+        mlir::Value nullAddr =
+            b.createNullConstant(currentLocation, baseAddrType);
+        mlir::Value box = b.create<fir::EmboxOp>(currentLocation, ty, nullAddr);
+        b.create<fir::HasValueOp>(currentLocation, box);
+      });
+    } else {
+      createInit([&](fir::FirOpBuilder &b) {
+        mlir::Value undef = b.create<fir::UndefOp>(currentLocation, ty);
+        b.create<fir::HasValueOp>(currentLocation, undef);
+      });
+    }
+    mlir::Value symValue = firOpBuilder.create<fir::AddrOfOp>(
+        currentLocation, global.resultType(), global.getSymbol());
+    symThreadprivateValue = firOpBuilder.create<mlir::omp::ThreadprivateOp>(
+        currentLocation, symValue.getType(), symValue);
+  } else {
+    mlir::Value symValue = converter.getSymbolAddress(sym);
+    symThreadprivateValue = firOpBuilder.create<mlir::omp::ThreadprivateOp>(
+        currentLocation, symValue.getType(), symValue);
+  }
+
+  fir::ExtendedValue sexv = converter.getSymbolExtValue(sym);
+  fir::ExtendedValue symThreadprivateExv =
+      getExtValue(sexv, symThreadprivateValue);
+  converter.bindSymbol(sym, symThreadprivateExv);
+}
+
 void Fortran::lower::genOpenMPDeclarativeConstruct(
     Fortran::lower::AbstractConverter &converter,
     Fortran::lower::pft::Evaluation &eval,
     const Fortran::parser::OpenMPDeclarativeConstruct &ompDeclConstruct) {
 
   std::visit(
       common::visitors{
           [&](const Fortran::parser::OpenMPDeclarativeAllocate
std::visit(
             TODO(converter.getCurrentLocation(), "OpenMPDeclareSimdConstruct");
           },
           [&](const Fortran::parser::OpenMPDeclareTargetConstruct
                   &declareTargetConstruct) {
             TODO(converter.getCurrentLocation(),
                  "OpenMPDeclareTargetConstruct");
           },
           [&](const Fortran::parser::OpenMPThreadprivate &threadprivate) {
-            TODO(converter.getCurrentLocation(), "OpenMPThreadprivate");
+            // The directive is lowered when instantiating the variable to
+            // support the case of threadprivate variable declared in module.
           },
       },
       ompDeclConstruct.u);
 }

flang/lib/Lower/PFTBuilder.cpp

 void Fortran::lower::pft::visitAllSymbols(
     const Fortran::lower::pft::FunctionLikeUnit &funit,
     const std::function<void(const Fortran::semantics::Symbol &)> callBack) {
   SymbolVisitor visitor{callBack};
   funit.visit([&](const auto &functionParserNode) {
     parser::Walk(functionParserNode, visitor);
   });
 }
+
+void Fortran::lower::pft::visitAllSymbols(
+    const Fortran::lower::pft::Evaluation &eval,
+    const std::function<void(const Fortran::semantics::Symbol &)> callBack) {
+  SymbolVisitor visitor{callBack};
+  eval.visit([&](const auto &functionParserNode) {
+    parser::Walk(functionParserNode, visitor);
+  });
+}

flang/test/Integration/OpenMPLLVM/threadprivate-char-array-chararray.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for character, array, and character array.
+
+!RUN: %flang_fc1 -emit-llvm -fopenmp %s -o - | FileCheck %s --check-prefix=LLVMIR
+
+module test
+  character :: x
+  integer :: y(5)
+  character(5) :: z(5)
+
+  !$omp threadprivate(x, y, z)
+
+!LLVMIR-DAG: @_QMtestEx = global [1 x i8] undef
+!LLVMIR-DAG: @_QMtestEy = global [5 x i32] undef
+!LLVMIR-DAG: @_QMtestEz = global [5 x [5 x i8]] undef
+
+!LLVMIR-DAG: @_QMtestEx.cache = common global i8** null
+!LLVMIR-DAG: @_QMtestEy.cache = common global i8** null
+!LLVMIR-DAG: @_QMtestEz.cache = common global i8** null
+
+contains
+  subroutine sub()
+! CHECK-LABEL: @_QMtestPsub()
+!LLVMIR:  [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE0:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0:[0-9]+]], i32 [[TMP0:%.*]], i8* getelementptr inbounds ([1 x i8], [1 x i8]* @_QMtestEx, i32 0, i32 0), i64 1, i8*** @_QMtestEx.cache)
+!LLVMIR-DAG:  [[LOAD0:%.*]] = bitcast i8* [[CACHE0]] to [1 x i8]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE1:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* bitcast ([5 x i32]* @_QMtestEy to i8*), i64 20, i8*** @_QMtestEy.cache)
+!LLVMIR-DAG:  [[LOAD1:%.*]] = bitcast i8* [[CACHE1]] to [5 x i32]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP2:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB2:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE2:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB2:[0-9]+]], i32 [[TMP2:%.*]], i8* getelementptr inbounds ([5 x [5 x i8]], [5 x [5 x i8]]* @_QMtestEz, i32 0, i32 0, i32 0), i64 25, i8*** @_QMtestEz.cache)
+!LLVMIR-DAG:  [[LOAD2:%.*]] = bitcast i8* [[CACHE2]] to [5 x [5 x i8]]*, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = bitcast [1 x i8]* [[LOAD0]] to i8*, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = insertvalue { [5 x i32]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [5 x i32]* undef, i64 4, i32 20180515, i8 1, i8 9, i8 0, i8 0
+!LLVMIR-DAG:  {{.*}} = insertvalue { [5 x [5 x i8]]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [5 x [5 x i8]]* undef, i64 5, i32 20180515, i8 1, i8 40, i8 0, i8 0
+    print *, x, y, z
+
+    !$omp parallel
+      print *, x, y, z
+    !$omp end parallel
+
+    print *, x, y, z
+
+! LLVMIR-LABEL: omp.par.region{{.*}}
+!LLVMIR:  [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE0:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0:[0-9]+]], i32 [[TMP0:%.*]], i8* getelementptr inbounds ([1 x i8], [1 x i8]* @_QMtestEx, i32 0, i32 0), i64 1, i8*** @_QMtestEx.cache)
+!LLVMIR-DAG:  [[LOAD0:%.*]] = bitcast i8* [[CACHE0]] to [1 x i8]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE1:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* bitcast ([5 x i32]* @_QMtestEy to i8*), i64 20, i8*** @_QMtestEy.cache)
+!LLVMIR-DAG:  [[LOAD1:%.*]] = bitcast i8* [[CACHE1]] to [5 x i32]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP2:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB2:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE2:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB2:[0-9]+]], i32 [[TMP2:%.*]], i8* getelementptr inbounds ([5 x [5 x i8]], [5 x [5 x i8]]* @_QMtestEz, i32 0, i32 0, i32 0), i64 25, i8*** @_QMtestEz.cache)
+!LLVMIR-DAG:  [[LOAD2:%.*]] = bitcast i8* [[CACHE2]] to [5 x [5 x i8]]*, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = bitcast [1 x i8]* [[LOAD0]] to i8*, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = insertvalue { [5 x i32]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [5 x i32]* undef, i64 4, i32 20180515, i8 1, i8 9, i8 0, i8 0
+!LLVMIR-DAG:  {{.*}} = insertvalue { [5 x [5 x i8]]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [5 x [5 x i8]]* undef, i64 5, i32 20180515, i8 1, i8 40, i8 0, i8 0
+  end
+end

flang/test/Integration/OpenMPLLVM/threadprivate-commonblock.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for common block.
+
+!RUN: %flang_fc1 -emit-llvm -fopenmp %s -o - | FileCheck %s --check-prefix=LLVMIR
+
+module test
+  integer:: a
+  real :: b(2)
+  complex, pointer :: c, d(:)
+  character(5) :: e, f(2)
+  common /blk/ a, b, c, d, e, f
+
+  !$omp threadprivate(/blk/)
+
+!LLVMIR-DAG: @_QBblk = common global [103 x i8] zeroinitializer
+
+!LLVMIR-DAG: @_QBblk.cache = common global i8** null
+
+contains
+  subroutine sub()
+!LLVMIR:  [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR:  [[TMP5:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0]], i32 [[TMP0]], i8* getelementptr inbounds ([103 x i8], [103 x i8]* @_QBblk, i32 0, i32 0), i64 103, i8*** @_QBblk.cache)
+!LLVMIR:  [[TMP6:%.*]] = bitcast i8* [[TMP5]] to [103 x i8]*, !dbg !{{.*}}
+!LLVMIR:  [[TMP7:%.*]] = bitcast [103 x i8]* [[TMP6]] to i8*, !dbg !{{.*}}
+!LLVMIR:  [[TMP8:%.*]] = getelementptr i8, i8* [[TMP7]], i64 0, !dbg !{{.*}}
+!LLVMIR:  [[TMP9:%.*]] = bitcast i8* [[TMP8]] to i32*, !dbg !{{.*}}
+!LLVMIR:  [[TMP10:%.*]] = getelementptr i8, i8* [[TMP7]], i64 4, !dbg !{{.*}}
+!LLVMIR:  [[TMP11:%.*]] = bitcast i8* [[TMP10]] to [2 x float]*, !dbg !{{.*}}
+!LLVMIR:  [[TMP12:%.*]] = getelementptr i8, i8* [[TMP7]], i64 16, !dbg !{{.*}}
+!LLVMIR:  [[TMP13:%.*]] = bitcast i8* [[TMP12]] to { { float, float }*, i64, i32, i8, i8, i8, i8 }*, !dbg !{{.*}}
+!LLVMIR:  [[TMP14:%.*]] = getelementptr i8, i8* [[TMP7]], i64 40, !dbg !{{.*}}
+!LLVMIR:  [[TMP15:%.*]] = bitcast i8* [[TMP14]] to { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }*, !dbg !{{.*}}
+!LLVMIR:  [[TMP16:%.*]] = getelementptr i8, i8* [[TMP7]], i64 88, !dbg !{{.*}}
+!LLVMIR:  [[TMP17:%.*]] = bitcast i8* [[TMP16]] to [5 x i8]*, !dbg !{{.*}}
+!LLVMIR:  [[TMP18:%.*]] = getelementptr i8, i8* [[TMP7]], i64 93, !dbg !{{.*}}
+!LLVMIR:  [[TMP19:%.*]] = bitcast i8* [[TMP18]] to [2 x [5 x i8]]*, !dbg !{{.*}}
+!LLVMIR:  %{{.*}} = load i32, i32* [[TMP9]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = insertvalue { [2 x float]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [2 x float]* undef, i64 4, i32 20180515, i8 1, i8 27, i8 0, i8 0
+!LLVMIR-DAG:  %{{.*}} = getelementptr { { float, float }*, i64, i32, i8, i8, i8, i8 }, { { float, float }*, i64, i32, i8, i8, i8, i8 }* [[TMP13]], i32 0, i32 0, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = getelementptr { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* [[TMP15]], i32 0, i32 7, i64 0, i32 0, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = bitcast [5 x i8]* [[TMP17]] to i8*, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = insertvalue { [2 x [5 x i8]]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [2 x [5 x i8]]* undef, i64 5, i32 20180515, i8 1, i8 40, i8 0, i8 0
+    print *, a, b, c, d, e, f
+
+    !$omp parallel
+      print *, a, b, c, d, e, f
+    !$omp end parallel
+
+!LLVMIR-DAG:  %{{.*}} = load i32, i32* [[TMP9]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = getelementptr { { float, float }*, i64, i32, i8, i8, i8, i8 }, { { float, float }*, i64, i32, i8, i8, i8, i8 }* [[TMP13]], i32 0, i32 0, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = getelementptr { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* [[TMP15]], i32 0, i32 7, i64 0, i32 0, !dbg !{{.*}}
+    print *, a, b, c, d, e, f
+
+! LLVMIR-LABEL: omp.par.region{{.*}}
+!LLVMIR:  [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR:  [[TMP5:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0]], i32 [[TMP0]], i8* getelementptr inbounds ([103 x i8], [103 x i8]* @_QBblk, i32 0, i32 0), i64 103, i8*** @_QBblk.cache)
+!LLVMIR-DAG:  [[TMP6:%.*]] = bitcast i8* [[TMP5]] to [103 x i8]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP7:%.*]] = bitcast [103 x i8]* [[TMP6]] to i8*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP8:%.*]] = getelementptr i8, i8* [[TMP7]], i64 0, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP9:%.*]] = bitcast i8* [[TMP8:%.*]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP10:%.*]] = getelementptr i8, i8* [[TMP7]], i64 4, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP11:%.*]] = bitcast i8* [[TMP10:%.*]] to [2 x float]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP12:%.*]] = getelementptr i8, i8* [[TMP7]], i64 16, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP13:%.*]] = bitcast i8* [[TMP12:%.*]] to { { float, float }*, i64, i32, i8, i8, i8, i8 }*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP14:%.*]] = getelementptr i8, i8* [[TMP7]], i64 40, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP15:%.*]] = bitcast i8* [[TMP14:%.*]] to { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP16:%.*]] = getelementptr i8, i8* [[TMP7]], i64 88, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP17:%.*]] = bitcast i8* [[TMP16:%.*]] to [5 x i8]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP18:%.*]] = getelementptr i8, i8* [[TMP7]], i64 93, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP19:%.*]] = bitcast i8* [[TMP18:%.*]] to [2 x [5 x i8]]*, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = load i32, i32* [[TMP9]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = insertvalue { [2 x float]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [2 x float]* undef, i64 4, i32 20180515, i8 1, i8 27, i8 0, i8 0
+!LLVMIR-DAG:  %{{.*}} = getelementptr { { float, float }*, i64, i32, i8, i8, i8, i8 }, { { float, float }*, i64, i32, i8, i8, i8, i8 }* [[TMP13]], i32 0, i32 0, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = getelementptr { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }, { { float, float }*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] }* [[TMP15]], i32 0, i32 7, i64 0, i32 0, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = bitcast [5 x i8]* [[TMP17]] to i8*, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = insertvalue { [2 x [5 x i8]]*, i64, i32, i8, i8, i8, i8, [1 x [3 x i64]] } { [2 x [5 x i8]]* undef, i64 5, i32 20180515, i8 1, i8 40, i8 0, i8 0
+  end
+end

flang/test/Integration/OpenMPLLVM/threadprivate-integer-different-kinds.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for variables with different kind.
+
+!REQUIRES: shell
+!RUN: %flang_fc1 -emit-llvm -fopenmp %s -o - | FileCheck %s --check-prefix=LLVMIR
+
+program test
+  integer, save :: i
+  integer(kind=1), save :: i1
+  integer(kind=2), save :: i2
+  integer(kind=4), save :: i4
+  integer(kind=8), save :: i8
+  integer(kind=16), save :: i16
+
+!LLVMIR-DAG: @_QFEi = internal global i32 undef
+!LLVMIR-DAG: @_QFEi1 = internal global i8 undef
+!LLVMIR-DAG: @_QFEi16 = internal global i128 undef
+!LLVMIR-DAG: @_QFEi2 = internal global i16 undef
+!LLVMIR-DAG: @_QFEi4 = internal global i32 undef
+!LLVMIR-DAG: @_QFEi8 = internal global i64 undef
+  !$omp threadprivate(i, i1, i2, i4, i8, i16)
+
+!LLVMIR-DAG: @_QFEi.cache = common global i8** null
+!LLVMIR-DAG: @_QFEi1.cache = common global i8** null
+!LLVMIR-DAG: @_QFEi16.cache = common global i8** null
+!LLVMIR-DAG: @_QFEi2.cache = common global i8** null
+!LLVMIR-DAG: @_QFEi4.cache = common global i8** null
+!LLVMIR-DAG: @_QFEi8.cache = common global i8** null
+
+! CHECK-LABEL: @_QQmain()
+!LLVMIR: [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR-DAG: [[CACHE0:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0:[0-9]+]], i32 [[TMP0:%.*]], i8* bitcast (i32* @_QFEi to i8*), i64 4, i8*** @_QFEi.cache)
+!LLVMIR-DAG: [[LOAD0:%.*]] = bitcast i8* [[CACHE0]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG: [[CACHE1:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* @_QFEi1, i64 1, i8*** @_QFEi1.cache)
+!LLVMIR-DAG: [[TMP2:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB2:[0-9]+]])
+!LLVMIR-DAG: [[CACHE2:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB2:[0-9]+]], i32 [[TMP2:%.*]], i8* bitcast (i16* @_QFEi2 to i8*), i64 2, i8*** @_QFEi2.cache)
+!LLVMIR-DAG: [[LOAD2:%.*]] = bitcast i8* [[CACHE2]] to i16*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP3:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB3:[0-9]+]])
+!LLVMIR-DAG: [[CACHE3:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB3:[0-9]+]], i32 [[TMP3:%.*]], i8* bitcast (i32* @_QFEi4 to i8*), i64 4, i8*** @_QFEi4.cache)
+!LLVMIR-DAG: [[LOAD3:%.*]] = bitcast i8* [[CACHE3]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP4:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB4:[0-9]+]])
+!LLVMIR-DAG: [[CACHE4:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB4:[0-9]+]], i32 [[TMP4:%.*]], i8* bitcast (i64* @_QFEi8 to i8*), i64 8, i8*** @_QFEi8.cache)
+!LLVMIR-DAG: [[LOAD4:%.*]] = bitcast i8* [[CACHE4]] to i64*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP5:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB5:[0-9]+]])
+!LLVMIR-DAG: [[CACHE5:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB5:[0-9]+]], i32 [[TMP5:%.*]], i8* bitcast (i128* @_QFEi16 to i8*), i64 16, i8*** @_QFEi16.cache)
+!LLVMIR-DAG: [[LOAD5:%.*]] = bitcast i8* [[CACHE5]] to i128*, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i32, i32* [[LOAD0]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i8, i8* [[CACHE1]], align 1, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i16, i16* [[LOAD2]], align 2, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i32, i32* [[LOAD3]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i64, i64* [[LOAD4]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i128, i128* [[LOAD5]], align 4, !dbg !{{.*}}
+  print *, i, i1, i2, i4, i8, i16
+
+  !$omp parallel
+    print *, i, i1, i2, i4, i8, i16
+  !$omp end parallel
+
+!LLVMIR-DAG: {{.*}} = load i32, i32* [[LOAD0]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i8, i8* [[CACHE1]], align 1, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i16, i16* [[LOAD2]], align 2, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i32, i32* [[LOAD3]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i64, i64* [[LOAD4]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i128, i128* [[LOAD5]], align 4, !dbg !{{.*}}
+  print *, i, i1, i2, i4, i8, i16
+
+! LLVMIR-LABEL: omp.par.region{{.*}}
+!LLVMIR: [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR-DAG: [[CACHE0:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0:[0-9]+]], i32 [[TMP0:%.*]], i8* bitcast (i32* @_QFEi to i8*), i64 4, i8*** @_QFEi.cache)
+!LLVMIR-DAG: [[LOAD0:%.*]] = bitcast i8* [[CACHE0]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG: [[CACHE1:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* @_QFEi1, i64 1, i8*** @_QFEi1.cache)
+!LLVMIR-DAG: [[TMP2:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB2:[0-9]+]])
+!LLVMIR-DAG: [[CACHE2:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB2:[0-9]+]], i32 [[TMP2:%.*]], i8* bitcast (i16* @_QFEi2 to i8*), i64 2, i8*** @_QFEi2.cache)
+!LLVMIR-DAG: [[LOAD2:%.*]] = bitcast i8* [[CACHE2]] to i16*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP3:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB3:[0-9]+]])
+!LLVMIR-DAG: [[CACHE3:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB3:[0-9]+]], i32 [[TMP3:%.*]], i8* bitcast (i32* @_QFEi4 to i8*), i64 4, i8*** @_QFEi4.cache)
+!LLVMIR-DAG: [[LOAD3:%.*]] = bitcast i8* [[CACHE3]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP4:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB4:[0-9]+]])
+!LLVMIR-DAG: [[CACHE4:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB4:[0-9]+]], i32 [[TMP4:%.*]], i8* bitcast (i64* @_QFEi8 to i8*), i64 8, i8*** @_QFEi8.cache)
+!LLVMIR-DAG: [[LOAD4:%.*]] = bitcast i8* [[CACHE4]] to i64*, !dbg !{{.*}}
+!LLVMIR-DAG: [[TMP5:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB5:[0-9]+]])
+!LLVMIR-DAG: [[CACHE5:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB5:[0-9]+]], i32 [[TMP5:%.*]], i8* bitcast (i128* @_QFEi16 to i8*), i64 16, i8*** @_QFEi16.cache)
+!LLVMIR-DAG: [[LOAD5:%.*]] = bitcast i8* [[CACHE5]] to i128*, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i32, i32* [[LOAD0]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i8, i8* [[CACHE1]], align 1, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i16, i16* [[LOAD2]], align 2, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i32, i32* [[LOAD3]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i64, i64* [[LOAD4]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG: {{.*}} = load i128, i128* [[LOAD5]], align 4, !dbg !{{.*}}
+end

flang/test/Integration/OpenMPLLVM/threadprivate-real-logical-complex-derivedtype.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for real, logical, complex, and derived type.
+
+!RUN: %flang_fc1 -emit-llvm -fopenmp %s -o - | FileCheck %s --check-prefix=LLVMIR
+
+module test
+  type my_type
+    integer :: t_i
+    real :: t_arr(5)
+  end type my_type
+  real :: x
+  complex :: y
+  logical :: z
+  type(my_type) :: t
+
+  !$omp threadprivate(x, y, z, t)
+
+!LLVMIR-DAG: %_QMtestTmy_type = type { i32, [5 x float] }
+!LLVMIR-DAG: @_QMtestEt = global %_QMtestTmy_type undef
+!LLVMIR-DAG: @_QMtestEx = global float undef
+!LLVMIR-DAG: @_QMtestEy = global { float, float } undef
+!LLVMIR-DAG: @_QMtestEz = global i32 undef
+
+!LLVMIR-DAG: @_QMtestEt.cache = common global i8** null
+!LLVMIR-DAG: @_QMtestEx.cache = common global i8** null
+!LLVMIR-DAG: @_QMtestEy.cache = common global i8** null
+!LLVMIR-DAG: @_QMtestEz.cache = common global i8** null
+
+contains
+  subroutine sub()
+! CHECK-LABEL: @_QMtestPsub()
+!LLVMIR:  [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE0:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0:[0-9]+]], i32 [[TMP0:%.*]], i8* bitcast (%_QMtestTmy_type* @_QMtestEt to i8*), i64 24, i8*** @_QMtestEt.cache)
+!LLVMIR-DAG:  [[LOAD0:%.*]] = bitcast i8* [[CACHE0]] to %_QMtestTmy_type*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE1:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* bitcast (float* @_QMtestEx to i8*), i64 4, i8*** @_QMtestEx.cache)
+!LLVMIR-DAG:  [[LOAD1:%.*]] = bitcast i8* [[CACHE1]] to float*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP2:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB2:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE2:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB2:[0-9]+]], i32 [[TMP2:%.*]], i8* bitcast ({ float, float }* @_QMtestEy to i8*), i64 8, i8*** @_QMtestEy.cache)
+!LLVMIR-DAG:  [[LOAD2:%.*]] = bitcast i8* [[CACHE2]] to { float, float }*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP3:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB3:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE3:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB3:[0-9]+]], i32 [[TMP3:%.*]], i8* bitcast (i32* @_QMtestEz to i8*), i64 4, i8*** @_QMtestEz.cache)
+!LLVMIR-DAG:  [[LOAD3:%.*]] = bitcast i8* [[CACHE3]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load float, float* [[LOAD1]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load { float, float }, { float, float }* [[LOAD2]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load i32, i32* [[LOAD3]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  [[GEP0:%.*]] = getelementptr %_QMtestTmy_type, %_QMtestTmy_type* [[LOAD0]], i64 0, i32 0, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load i32, i32* [[GEP0]], align 4, !dbg !{{.*}}
+    print *, x, y, z, t%t_i
+
+    !$omp parallel
+      print *, x, y, z, t%t_i
+    !$omp end parallel
+
+!LLVMIR-DAG:  %{{.*}} = load float, float* [[LOAD1]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = load { float, float }, { float, float }* [[LOAD2]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = load i32, i32* [[LOAD3]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = load i32, i32* [[GEP0]], align 4, !dbg !{{.*}}
+    print *, x, y, z, t%t_i
+
+! LLVMIR-LABEL: omp.par.region{{.*}}
+!LLVMIR:  [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE0:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0:[0-9]+]], i32 [[TMP0:%.*]], i8* bitcast (%_QMtestTmy_type* @_QMtestEt to i8*), i64 24, i8*** @_QMtestEt.cache)
+!LLVMIR-DAG:  [[LOAD0:%.*]] = bitcast i8* [[CACHE0]] to %_QMtestTmy_type*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE1:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* bitcast (float* @_QMtestEx to i8*), i64 4, i8*** @_QMtestEx.cache)
+!LLVMIR-DAG:  [[LOAD1:%.*]] = bitcast i8* [[CACHE1]] to float*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP2:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB2:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE2:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB2:[0-9]+]], i32 [[TMP2:%.*]], i8* bitcast ({ float, float }* @_QMtestEy to i8*), i64 8, i8*** @_QMtestEy.cache)
+!LLVMIR-DAG:  [[LOAD2:%.*]] = bitcast i8* [[CACHE2]] to { float, float }*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP3:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB3:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE3:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB3:[0-9]+]], i32 [[TMP3:%.*]], i8* bitcast (i32* @_QMtestEz to i8*), i64 4, i8*** @_QMtestEz.cache)
+!LLVMIR-DAG:  [[LOAD3:%.*]] = bitcast i8* [[CACHE3]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load float, float* [[LOAD1]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load { float, float }, { float, float }* [[LOAD2]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load i32, i32* [[LOAD3]], align 4, !dbg !{{.*}}
+!LLVMIR-DAG:  [[GEP0:%.*]] = getelementptr %_QMtestTmy_type, %_QMtestTmy_type* [[LOAD0]], i64 0, i32 0, !dbg !{{.*}}
+!LLVMIR-DAG:  {{.*}} = load i32, i32* [[GEP0]], align 4, !dbg !{{.*}}
+  end
+end

flang/test/Integration/OpenMPLLVM/threadprivate-use-association.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for threadprivate variable in use association.
+
+!RUN: %flang_fc1 -emit-llvm -fopenmp %s -o - | FileCheck %s --check-prefix=LLVMIR
+
+!LLVMIR-DAG: @_QBblk = common global [24 x i8] zeroinitializer
+!LLVMIR-DAG: @_QMtestEy = global float undef
+
+!LLVMIR-DAG: @_QBblk.cache = common global i8** null
+!LLVMIR-DAG: @_QMtestEy.cache = common global i8** null
+
+module test
+  integer :: x
+  real :: y, z(5)
+  common /blk/ x, z
+
+  !$omp threadprivate(y, /blk/)
+
+contains
+  subroutine sub()
+    !$omp parallel
+! LLVMIR-LABEL: @_QMtestPsub..omp_par
+! LLVMIR-LABEL: omp.par.region{{.*}}
+!LLVMIR-DAG:  [[TMP0:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB0:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE0:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB0:[0-9]+]], i32 [[TMP0:%.*]], i8* getelementptr inbounds ([24 x i8], [24 x i8]* @_QBblk, i32 0, i32 0), i64 24, i8*** @_QBblk.cache)
+!LLVMIR-DAG:  [[INS4:%.*]] = bitcast i8* [[CACHE0]] to [24 x i8]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG:  [[CACHE1:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* bitcast (float* @_QMtestEy to i8*), i64 4, i8*** @_QMtestEy.cache)
+!LLVMIR-DAG:  [[INS7:%.*]] = bitcast i8* [[CACHE1]] to float*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[INS8:%.*]] = bitcast [24 x i8]* [[INS4]] to i8*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[INS9:%.*]] = getelementptr i8, i8* [[INS8]], i64 0, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = bitcast i8* [[INS9]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[INS11:%.*]] = getelementptr i8, i8* [[INS8]], i64 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = bitcast i8* [[INS11]] to [5 x float]*, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = load float, float* [[INS7]], align 4, !dbg !{{.*}}
+      print *, x, y, z
+    !$omp end parallel
+  end
+end
+
+program main
+  use test
+  integer :: x1
+  real :: z1(5)
+  common /blk/ x1, z1
+
+  !$omp threadprivate(/blk/)
+
+  call sub()
+
+  !$omp parallel
+! LLVMIR-LABEL: @_QQmain..omp_par
+! LLVMIR-LABEL: omp.par.region{{.*}}
+!LLVMIR-DAG:  [[TMP1:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB1:[0-9]+]])
+!LLVMIR-DAG:  [[INS6:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB1:[0-9]+]], i32 [[TMP1:%.*]], i8* getelementptr inbounds ([24 x i8], [24 x i8]* @_QBblk, i32 0, i32 0), i64 24, i8*** @_QBblk.cache)
+!LLVMIR-DAG:  [[INS7:%.*]] = bitcast i8* [[INS6]] to [24 x i8]*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[TMP2:%.*]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* @[[GLOB2:[0-9]+]])
+!LLVMIR-DAG:  [[INS9:%.*]] = call i8* @__kmpc_threadprivate_cached(%struct.ident_t* @[[GLOB2:[0-9]+]], i32 [[TMP1:%.*]], i8* bitcast (float* @_QMtestEy to i8*), i64 4, i8*** @_QMtestEy.cache)
+!LLVMIR-DAG:  [[INS10:%.*]] = bitcast i8* [[INS9]] to float*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[INS11:%.*]] = bitcast [24 x i8]* [[INS7]] to i8*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[INS12:%.*]] = getelementptr i8, i8* [[INS11]], i64 0, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = bitcast i8* [[INS12]] to i32*, !dbg !{{.*}}
+!LLVMIR-DAG:  [[INS14:%.*]] = getelementptr i8, i8* [[INS11]], i64 4, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = bitcast i8* [[INS14]] to [5 x float]*, !dbg !{{.*}}
+!LLVMIR-DAG:  %{{.*}} = load float, float* [[INS10]], align 4, !dbg !{{.*}}
+    print *, x1, y, z1
+  !$omp end parallel
+
+end

flang/test/Lower/OpenMP/omp-threadprivate.f90

-! This test checks lowering of OpenMP threadprivate Directive.
-! XFAIL: *
-! RUN: %bbc -fopenmp -emit-fir %s -o  - | \
-! RUN:   FileCheck %s --check-prefix=FIRDialect
-
-program main
-  integer, save :: x, y
-
-  !$omp threadprivate(x, y)
-end

flang/test/Lower/OpenMP/threadprivate-char-array-chararray.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for character, array, and character array.
+
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefix=FIRDialect
+
+module test
+  character :: x
+  integer :: y(5)
+  character(5) :: z(5)
+
+  !$omp threadprivate(x, y, z)
+
+!FIRDialect-DAG: fir.global @_QMtestEx : !fir.char<1> {
+!FIRDialect-DAG: fir.global @_QMtestEy : !fir.array<5xi32> {
+!FIRDialect-DAG: fir.global @_QMtestEz : !fir.array<5x!fir.char<1,5>> {
+
+contains
+  subroutine sub()
+!FIRDialect-DAG:  [[ADDR0:%.*]] = fir.address_of(@_QMtestEx) : !fir.ref<!fir.char<1>>
+!FIRDialect-DAG:  [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.char<1>> -> !fir.ref<!fir.char<1>>
+!FIRDialect-DAG:  [[ADDR1:%.*]] = fir.address_of(@_QMtestEy) : !fir.ref<!fir.array<5xi32>>
+!FIRDialect-DAG:  [[NEWADDR1:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.array<5xi32>> -> !fir.ref<!fir.array<5xi32>>
+!FIRDialect-DAG:  [[ADDR2:%.*]] = fir.address_of(@_QMtestEz) : !fir.ref<!fir.array<5x!fir.char<1,5>>>
+!FIRDialect-DAG:  [[NEWADDR2:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.array<5x!fir.char<1,5>>> -> !fir.ref<!fir.array<5x!fir.char<1,5>>>
+!FIRDialect-DAG:  %{{.*}} = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.char<1>>) -> !fir.ref<i8>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[NEWADDR1]](%{{.*}}) : (!fir.ref<!fir.array<5xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<5xi32>>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[NEWADDR2]](%{{.*}}) : (!fir.ref<!fir.array<5x!fir.char<1,5>>>, !fir.shape<1>) -> !fir.box<!fir.array<5x!fir.char<1,5>>>
+    print *, x, y, z
+
+    !$omp parallel
+!FIRDialect-DAG:    [[ADDR33:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.char<1>> -> !fir.ref<!fir.char<1>>
+!FIRDialect-DAG:    [[ADDR34:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.array<5xi32>> -> !fir.ref<!fir.array<5xi32>>
+!FIRDialect-DAG:    [[ADDR35:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.array<5x!fir.char<1,5>>> -> !fir.ref<!fir.array<5x!fir.char<1,5>>>
+!FIRDialect-DAG:    %{{.*}} = fir.convert [[ADDR33]] : (!fir.ref<!fir.char<1>>) -> !fir.ref<i8>
+!FIRDialect-DAG:    %{{.*}} = fir.embox [[ADDR34]](%{{.*}}) : (!fir.ref<!fir.array<5xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<5xi32>>
+!FIRDialect-DAG:    %{{.*}} = fir.embox [[ADDR35]](%{{.*}}) : (!fir.ref<!fir.array<5x!fir.char<1,5>>>, !fir.shape<1>) -> !fir.box<!fir.array<5x!fir.char<1,5>>>
+      print *, x, y, z
+    !$omp end parallel
+
+!FIRDialect-DAG:  %{{.*}} = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.char<1>>) -> !fir.ref<i8>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[NEWADDR1]](%{{.*}}) : (!fir.ref<!fir.array<5xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<5xi32>>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[NEWADDR2]](%{{.*}}) : (!fir.ref<!fir.array<5x!fir.char<1,5>>>, !fir.shape<1>) -> !fir.box<!fir.array<5x!fir.char<1,5>>>
+    print *, x, y, z
+
+  end
+end

flang/test/Lower/OpenMP/threadprivate-commonblock.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for common block.
+
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefix=FIRDialect
+
+module test
+  integer:: a
+  real :: b(2)
+  complex, pointer :: c, d(:)
+  character(5) :: e, f(2)
+  common /blk/ a, b, c, d, e, f
+
+  !$omp threadprivate(/blk/)
+
+!FIRDialect: fir.global common @_QBblk(dense<0> : vector<103xi8>) : !fir.array<103xi8>
+
+contains
+  subroutine sub()
+!FIRDialect:  [[ADDR0:%.*]] = fir.address_of(@_QBblk) : !fir.ref<!fir.array<103xi8>>
+!FIRDialect:  [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.array<103xi8>> -> !fir.ref<!fir.array<103xi8>>
+!FIRDialect-DAG:  [[ADDR1:%.*]] = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:  [[C0:%.*]] = arith.constant 0 : index
+!FIRDialect-DAG:  [[ADDR2:%.*]] = fir.coordinate_of [[ADDR1]], [[C0]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:  [[ADDR3:%.*]] = fir.convert [[ADDR2]] : (!fir.ref<i8>) -> !fir.ref<i32>
+!FIRDialect-DAG:  [[ADDR4:%.*]] = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:  [[C1:%.*]] = arith.constant 4 : index
+!FIRDialect-DAG:  [[ADDR5:%.*]] = fir.coordinate_of [[ADDR4]], [[C1]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:  [[ADDR6:%.*]] = fir.convert [[ADDR5]] : (!fir.ref<i8>) -> !fir.ref<!fir.array<2xf32>>
+!FIRDialect-DAG:  [[ADDR7:%.*]] = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:  [[C2:%.*]] = arith.constant 16 : index
+!FIRDialect-DAG:  [[ADDR8:%.*]] = fir.coordinate_of [[ADDR7]], [[C2]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:  [[ADDR9:%.*]] = fir.convert [[ADDR8]] : (!fir.ref<i8>) -> !fir.ref<!fir.box<!fir.ptr<!fir.complex<4>>>>
+!FIRDialect-DAG:  [[ADDR10:%.*]] = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:  [[C3:%.*]] = arith.constant 40 : index
+!FIRDialect-DAG:  [[ADDR11:%.*]] = fir.coordinate_of [[ADDR10]], [[C3]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:  [[ADDR12:%.*]] = fir.convert [[ADDR11]] : (!fir.ref<i8>) -> !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.complex<4>>>>>
+!FIRDialect-DAG:  [[ADDR13:%.*]] = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:  [[C4:%.*]] = arith.constant 88 : index
+!FIRDialect-DAG:  [[ADDR14:%.*]] = fir.coordinate_of [[ADDR13]], [[C4]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:  [[ADDR15:%.*]] = fir.convert [[ADDR14]] : (!fir.ref<i8>) -> !fir.ref<!fir.char<1,5>>
+!FIRDialect-DAG:  [[ADDR16:%.*]] = fir.convert [[NEWADDR0]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:  [[C5:%.*]] = arith.constant 93 : index
+!FIRDialect-DAG:  [[ADDR17:%.*]] = fir.coordinate_of [[ADDR16]], [[C5]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:  [[ADDR18:%.*]] = fir.convert [[ADDR17]] : (!fir.ref<i8>) -> !fir.ref<!fir.array<2x!fir.char<1,5>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[ADDR3]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[ADDR6]](%{{.*}}) : (!fir.ref<!fir.array<2xf32>>, !fir.shape<1>) -> !fir.box<!fir.array<2xf32>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[ADDR9]] : !fir.ref<!fir.box<!fir.ptr<!fir.complex<4>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[ADDR12]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.complex<4>>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.convert [[ADDR15]] : (!fir.ref<!fir.char<1,5>>) -> !fir.ref<i8>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[ADDR18]](%{{.*}}) : (!fir.ref<!fir.array<2x!fir.char<1,5>>>, !fir.shape<1>) -> !fir.box<!fir.array<2x!fir.char<1,5>>>
+    print *, a, b, c, d, e, f
+
+    !$omp parallel
+!FIRDialect:    [[ADDR77:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.array<103xi8>> -> !fir.ref<!fir.array<103xi8>>
+!FIRDialect-DAG:    [[ADDR78:%.*]] = fir.convert [[ADDR77]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR79:%.*]] = fir.coordinate_of [[ADDR78]], [[C0:%.*]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR80:%.*]] = fir.convert [[ADDR79:%.*]] : (!fir.ref<i8>) -> !fir.ref<i32>
+!FIRDialect-DAG:    [[ADDR81:%.*]] = fir.convert [[ADDR77]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR82:%.*]] = fir.coordinate_of [[ADDR81]], [[C1:%.*]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR83:%.*]] = fir.convert [[ADDR82:%.*]] : (!fir.ref<i8>) -> !fir.ref<!fir.array<2xf32>>
+!FIRDialect-DAG:    [[ADDR84:%.*]] = fir.convert [[ADDR77]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR85:%.*]] = fir.coordinate_of [[ADDR84]], [[C2:%.*]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR86:%.*]] = fir.convert [[ADDR85:%.*]] : (!fir.ref<i8>) -> !fir.ref<!fir.box<!fir.ptr<!fir.complex<4>>>>
+!FIRDialect-DAG:    [[ADDR87:%.*]] = fir.convert [[ADDR77]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR88:%.*]] = fir.coordinate_of [[ADDR87]], [[C3:%.*]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR89:%.*]] = fir.convert [[ADDR88:%.*]] : (!fir.ref<i8>) -> !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.complex<4>>>>>
+!FIRDialect-DAG:    [[ADDR90:%.*]] = fir.convert [[ADDR77]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR91:%.*]] = fir.coordinate_of [[ADDR90]], [[C4:%.*]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR92:%.*]] = fir.convert [[ADDR91:%.*]] : (!fir.ref<i8>) -> !fir.ref<!fir.char<1,5>>
+!FIRDialect-DAG:    [[ADDR93:%.*]] = fir.convert [[ADDR77]] : (!fir.ref<!fir.array<103xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR94:%.*]] = fir.coordinate_of [[ADDR93]], [[C5:%.*]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR95:%.*]] = fir.convert [[ADDR94:%.*]] : (!fir.ref<i8>) -> !fir.ref<!fir.array<2x!fir.char<1,5>>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR80]] : !fir.ref<i32>
+!FIRDialect-DAG:    %{{.*}} = fir.embox [[ADDR83]](%{{.*}}) : (!fir.ref<!fir.array<2xf32>>, !fir.shape<1>) -> !fir.box<!fir.array<2xf32>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR86]] : !fir.ref<!fir.box<!fir.ptr<!fir.complex<4>>>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR89]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.complex<4>>>>>
+!FIRDialect-DAG:    %{{.*}} = fir.convert [[ADDR92]] : (!fir.ref<!fir.char<1,5>>) -> !fir.ref<i8>
+!FIRDialect-DAG:    %{{.*}} = fir.embox [[ADDR95]](%{{.*}}) : (!fir.ref<!fir.array<2x!fir.char<1,5>>>, !fir.shape<1>) -> !fir.box<!fir.array<2x!fir.char<1,5>>>
+      print *, a, b, c, d, e, f
+    !$omp end parallel
+
+!FIRDialect-DAG:  %{{.*}} = fir.load [[ADDR3]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[ADDR6]](%{{.*}}) : (!fir.ref<!fir.array<2xf32>>, !fir.shape<1>) -> !fir.box<!fir.array<2xf32>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[ADDR9]] : !fir.ref<!fir.box<!fir.ptr<!fir.complex<4>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[ADDR12]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.complex<4>>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.convert [[ADDR15]] : (!fir.ref<!fir.char<1,5>>) -> !fir.ref<i8>
+!FIRDialect-DAG:  %{{.*}} = fir.embox [[ADDR18]](%{{.*}}) : (!fir.ref<!fir.array<2x!fir.char<1,5>>>, !fir.shape<1>) -> !fir.box<!fir.array<2x!fir.char<1,5>>>
+    print *, a, b, c, d, e, f
+
+  end
+end

flang/test/Lower/OpenMP/threadprivate-integer-different-kinds.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for variables with different kind.
+
+!REQUIRES: shell
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefix=FIRDialect
+
+program test
+  integer, save :: i
+  integer(kind=1), save :: i1
+  integer(kind=2), save :: i2
+  integer(kind=4), save :: i4
+  integer(kind=8), save :: i8
+  integer(kind=16), save :: i16
+
+!FIRDialect-DAG:  [[ADDR0:%.*]] = fir.address_of(@_QFEi) : !fir.ref<i32>
+!FIRDialect-DAG:  [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<i32> -> !fir.ref<i32>
+!FIRDialect-DAG:  [[ADDR1:%.*]] = fir.address_of(@_QFEi1) : !fir.ref<i8>
+!FIRDialect-DAG:  [[NEWADDR1:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<i8> -> !fir.ref<i8>
+!FIRDialect-DAG:  [[ADDR2:%.*]] = fir.address_of(@_QFEi16) : !fir.ref<i128>
+!FIRDialect-DAG:  [[NEWADDR2:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<i128> -> !fir.ref<i128>
+!FIRDialect-DAG:  [[ADDR3:%.*]] = fir.address_of(@_QFEi2) : !fir.ref<i16>
+!FIRDialect-DAG:  [[NEWADDR3:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<i16> -> !fir.ref<i16>
+!FIRDialect-DAG:  [[ADDR4:%.*]] = fir.address_of(@_QFEi4) : !fir.ref<i32>
+!FIRDialect-DAG:  [[NEWADDR4:%.*]] = omp.threadprivate [[ADDR4]] : !fir.ref<i32> -> !fir.ref<i32>
+!FIRDialect-DAG:  [[ADDR5:%.*]] = fir.address_of(@_QFEi8) : !fir.ref<i64>
+!FIRDialect-DAG:  [[NEWADDR5:%.*]] = omp.threadprivate [[ADDR5]] : !fir.ref<i64> -> !fir.ref<i64>
+  !$omp threadprivate(i, i1, i2, i4, i8, i16)
+
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR0]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<i8>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<i128>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<i16>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR4]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR5]] : !fir.ref<i64>
+  print *, i, i1, i2, i4, i8, i16
+
+  !$omp parallel
+!FIRDialect-DAG:    [[ADDR39:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<i32> -> !fir.ref<i32>
+!FIRDialect-DAG:    [[ADDR40:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<i8> -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR41:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<i128> -> !fir.ref<i128>
+!FIRDialect-DAG:    [[ADDR42:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<i16> -> !fir.ref<i16>
+!FIRDialect-DAG:    [[ADDR43:%.*]] = omp.threadprivate [[ADDR4]] : !fir.ref<i32> -> !fir.ref<i32>
+!FIRDialect-DAG:    [[ADDR44:%.*]] = omp.threadprivate [[ADDR5]] : !fir.ref<i64> -> !fir.ref<i64>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR39]] : !fir.ref<i32>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR40]] : !fir.ref<i8>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR41]] : !fir.ref<i128>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR42]] : !fir.ref<i16>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR43]] : !fir.ref<i32>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR44]] : !fir.ref<i64>
+    print *, i, i1, i2, i4, i8, i16
+  !$omp end parallel
+
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR0]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<i8>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<i128>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<i16>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR4]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR5]] : !fir.ref<i64>
+  print *, i, i1, i2, i4, i8, i16
+
+!FIRDialect-DAG: fir.global internal @_QFEi : i32 {
+!FIRDialect-DAG: fir.global internal @_QFEi1 : i8 {
+!FIRDialect-DAG: fir.global internal @_QFEi16 : i128 {
+!FIRDialect-DAG: fir.global internal @_QFEi2 : i16 {
+!FIRDialect-DAG: fir.global internal @_QFEi4 : i32 {
+!FIRDialect-DAG: fir.global internal @_QFEi8 : i64 {
+end

flang/test/Lower/OpenMP/threadprivate-non-global.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for non-character non-SAVEd non-initialized scalars with or without
+! allocatable or pointer attribute in main program.
+
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefix=FIRDialect
+
+program test
+  integer :: x
+  real :: y
+  logical :: z
+  complex :: w
+  integer, pointer :: a
+  real, allocatable :: b
+
+!FIRDialect-DAG:  [[ADDR0:%.*]] = fir.address_of(@_QFEa) : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>> -> !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  [[ADDR1:%.*]] = fir.address_of(@_QFEb) : !fir.ref<!fir.box<!fir.heap<f32>>>
+!FIRDialect-DAG:  [[NEWADDR1:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>> -> !fir.ref<!fir.box<!fir.heap<f32>>>
+!FIRDialect-DAG:  [[ADDR2:%.*]] = fir.address_of(@_QFEw) : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  [[NEWADDR2:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.complex<4>> -> !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  [[ADDR3:%.*]] = fir.address_of(@_QFEx) : !fir.ref<i32>
+!FIRDialect-DAG:  [[NEWADDR3:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<i32> -> !fir.ref<i32>
+!FIRDialect-DAG:  [[ADDR4:%.*]] = fir.address_of(@_QFEy) : !fir.ref<f32>
+!FIRDialect-DAG:  [[NEWADDR4:%.*]] = omp.threadprivate [[ADDR4]] : !fir.ref<f32> -> !fir.ref<f32>
+!FIRDialect-DAG:  [[ADDR5:%.*]] = fir.address_of(@_QFEz) : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:  [[NEWADDR5:%.*]] = omp.threadprivate [[ADDR5]] : !fir.ref<!fir.logical<4>> -> !fir.ref<!fir.logical<4>>
+  !$omp threadprivate(x, y, z, w, a, b, w, a, b)
+
+  call sub(a, b)
+
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR4]] : !fir.ref<f32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR5]] : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>>
+  print *, x, y, z, w, a, b
+
+  !$omp parallel
+!FIRDialect-DAG:    [[ADDR68:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>> -> !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:    [[ADDR69:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>> -> !fir.ref<!fir.box<!fir.heap<f32>>>
+!FIRDialect-DAG:    [[ADDR70:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.complex<4>> -> !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:    [[ADDR71:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<i32> -> !fir.ref<i32>
+!FIRDialect-DAG:    [[ADDR72:%.*]] = omp.threadprivate [[ADDR4]] : !fir.ref<f32> -> !fir.ref<f32>
+!FIRDialect-DAG:    [[ADDR73:%.*]] = omp.threadprivate [[ADDR5]] : !fir.ref<!fir.logical<4>> -> !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR71]] : !fir.ref<i32>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR72]] : !fir.ref<f32>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR73]] : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR70]] : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR68]] : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR69]] : !fir.ref<!fir.box<!fir.heap<f32>>>
+    print *, x, y, z, w, a, b
+  !$omp end parallel
+
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<i32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR4]] : !fir.ref<f32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR5]] : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>>
+  print *, x, y, z, w, a, b
+
+!FIRDialect:  return
+
+!FIRDialect-DAG: fir.global internal @_QFEa : !fir.box<!fir.ptr<i32>> {
+!FIRDialect-DAG:   [[Z0:%.*]] = fir.zero_bits !fir.ptr<i32>
+!FIRDialect-DAG:   [[E0:%.*]] = fir.embox [[Z0]] : (!fir.ptr<i32>) -> !fir.box<!fir.ptr<i32>>
+!FIRDialect-DAG:   fir.has_value [[E0]] : !fir.box<!fir.ptr<i32>>
+!FIRDialect-DAG: }
+!FIRDialect-DAG: fir.global internal @_QFEb : !fir.box<!fir.heap<f32>> {
+!FIRDialect-DAG:   [[Z1:%.*]] = fir.zero_bits !fir.heap<f32>
+!FIRDialect-DAG:   [[E1:%.*]] = fir.embox [[Z1]] : (!fir.heap<f32>) -> !fir.box<!fir.heap<f32>>
+!FIRDialect-DAG:   fir.has_value [[E1]] : !fir.box<!fir.heap<f32>>
+!FIRDialect-DAG: }
+!FIRDialect-DAG: fir.global internal @_QFEw : !fir.complex<4> {
+!FIRDialect-DAG:   [[Z2:%.*]] = fir.undefined !fir.complex<4>
+!FIRDialect-DAG:   fir.has_value [[Z2]] : !fir.complex<4>
+!FIRDialect-DAG: }
+!FIRDialect-DAG: fir.global internal @_QFEx : i32 {
+!FIRDialect-DAG:   [[Z3:%.*]] = fir.undefined i32
+!FIRDialect-DAG:   fir.has_value [[Z3]] : i32
+!FIRDialect-DAG: }
+!FIRDialect-DAG: fir.global internal @_QFEy : f32 {
+!FIRDialect-DAG:   [[Z4:%.*]] = fir.undefined f32
+!FIRDialect-DAG:   fir.has_value [[Z4]] : f32
+!FIRDialect-DAG: }
+!FIRDialect-DAG: fir.global internal @_QFEz : !fir.logical<4> {
+!FIRDialect-DAG:   [[Z5:%.*]] = fir.undefined !fir.logical<4>
+!FIRDialect-DAG:   fir.has_value [[Z5]] : !fir.logical<4>
+!FIRDialect-DAG: }
+end

flang/test/Lower/OpenMP/threadprivate-pointer-allocatable.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for allocatable and pointer variables.
+
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefix=FIRDialect
+
+module test
+  integer, pointer :: x(:), m
+  real, allocatable :: y(:), n
+
+  !$omp threadprivate(x, y, m, n)
+
+!FIRDialect-DAG: fir.global @_QMtestEm : !fir.box<!fir.ptr<i32>> {
+!FIRDialect-DAG: fir.global @_QMtestEn : !fir.box<!fir.heap<f32>> {
+!FIRDialect-DAG: fir.global @_QMtestEx : !fir.box<!fir.ptr<!fir.array<?xi32>>> {
+!FIRDialect-DAG: fir.global @_QMtestEy : !fir.box<!fir.heap<!fir.array<?xf32>>> {
+
+contains
+  subroutine sub()
+!FIRDialect-DAG:  [[ADDR0:%.*]] = fir.address_of(@_QMtestEm) : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>> -> !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  [[ADDR1:%.*]] = fir.address_of(@_QMtestEn) : !fir.ref<!fir.box<!fir.heap<f32>>>
+!FIRDialect-DAG:  [[NEWADDR1:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>> -> !fir.ref<!fir.box<!fir.heap<f32>>>
+!FIRDialect-DAG:  [[ADDR2:%.*]] = fir.address_of(@_QMtestEx) : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
+!FIRDialect-DAG:  [[NEWADDR2:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>> -> !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
+!FIRDialect-DAG:  [[ADDR3:%.*]] = fir.address_of(@_QMtestEy) : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+!FIRDialect-DAG:  [[NEWADDR3:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>> -> !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>>
+    print *, x, y, m, n
+
+    !$omp parallel
+!FIRDialect-DAG:    [[ADDR54:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>> -> !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:    [[ADDR55:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>> -> !fir.ref<!fir.box<!fir.heap<f32>>>
+!FIRDialect-DAG:    [[ADDR56:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>> -> !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
+!FIRDialect-DAG:    [[ADDR57:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>> -> !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR56]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR57]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR54]] : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR55]] : !fir.ref<!fir.box<!fir.heap<f32>>>
+      print *, x, y, m, n
+    !$omp end parallel
+
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?xi32>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR0]] : !fir.ref<!fir.box<!fir.ptr<i32>>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<!fir.box<!fir.heap<f32>>>
+    print *, x, y, m, n
+  end
+end

flang/test/Lower/OpenMP/threadprivate-real-logical-complex-derivedtype.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for real, logical, complex, and derived type.
+
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefix=FIRDialect
+
+module test
+  type my_type
+    integer :: t_i
+    real :: t_arr(5)
+  end type my_type
+  real :: x
+  complex :: y
+  logical :: z
+  type(my_type) :: t
+
+  !$omp threadprivate(x, y, z, t)
+
+!FIRDialect-DAG: fir.global @_QMtestEt : !fir.type<_QMtestTmy_type{t_i:i32,t_arr:!fir.array<5xf32>}> {
+!FIRDialect-DAG: fir.global @_QMtestEx : f32 {
+!FIRDialect-DAG: fir.global @_QMtestEy : !fir.complex<4> {
+!FIRDialect-DAG: fir.global @_QMtestEz : !fir.logical<4> {
+
+contains
+  subroutine sub()
+!FIRDialect-DAG:  [[ADDR0:%.*]] = fir.address_of(@_QMtestEt) : !fir.ref<!fir.type<_QMtestTmy_type{t_i:i32,t_arr:!fir.array<5xf32>}>>
+!FIRDialect-DAG:  [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.type<_QMtestTmy_type{t_i:i32,t_arr:!fir.array<5xf32>}>> -> !fir.ref<!fir.type<_QMtestTmy_type{t_i:i32,t_arr:!fir.array<5xf32>}>>
+!FIRDialect-DAG:  [[ADDR1:%.*]] = fir.address_of(@_QMtestEx) : !fir.ref<f32>
+!FIRDialect-DAG:  [[NEWADDR1:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<f32> -> !fir.ref<f32>
+!FIRDialect-DAG:  [[ADDR2:%.*]] = fir.address_of(@_QMtestEy) : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  [[NEWADDR2:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.complex<4>> -> !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  [[ADDR3:%.*]] = fir.address_of(@_QMtestEz) : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:  [[NEWADDR3:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<!fir.logical<4>> -> !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<f32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.coordinate_of [[NEWADDR0]]
+    print *, x, y, z, t%t_i
+
+    !$omp parallel
+!FIRDialect-DAG:    [[ADDR38:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.type<_QMtestTmy_type{t_i:i32,t_arr:!fir.array<5xf32>}>> -> !fir.ref<!fir.type<_QMtestTmy_type{t_i:i32,t_arr:!fir.array<5xf32>}>>
+!FIRDialect-DAG:    [[ADDR39:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<f32> -> !fir.ref<f32>
+!FIRDialect-DAG:    [[ADDR40:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<!fir.complex<4>> -> !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:    [[ADDR41:%.*]] = omp.threadprivate [[ADDR3]] : !fir.ref<!fir.logical<4>> -> !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR39]] : !fir.ref<f32>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR40]] : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR41]] : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:    %{{.*}} = fir.coordinate_of [[ADDR38]]
+      print *, x, y, z, t%t_i
+    !$omp end parallel
+
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR1]] : !fir.ref<f32>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR2]] : !fir.ref<!fir.complex<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.load [[NEWADDR3]] : !fir.ref<!fir.logical<4>>
+!FIRDialect-DAG:  %{{.*}} = fir.coordinate_of [[NEWADDR0]]
+    print *, x, y, z, t%t_i
+
+  end
+end

flang/test/Lower/OpenMP/threadprivate-use-association.f90

+! This test checks lowering of OpenMP Threadprivate Directive.
+! Test for threadprivate variable in use association.
+
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefix=FIRDialect
+
+!FIRDialect-DAG: fir.global common @_QBblk(dense<0> : vector<24xi8>) : !fir.array<24xi8>
+!FIRDialect-DAG: fir.global @_QMtestEy : f32 {
+
+module test
+  integer :: x
+  real :: y, z(5)
+  common /blk/ x, z
+
+  !$omp threadprivate(y, /blk/)
+
+contains
+  subroutine sub()
+! FIRDialect-LABEL: @_QMtestPsub
+!FIRDialect-DAG:   [[ADDR0:%.*]] = fir.address_of(@_QBblk) : !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:   [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.array<24xi8>> -> !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:   [[ADDR1:%.*]] = fir.address_of(@_QMtestEy) : !fir.ref<f32>
+!FIRDialect-DAG:   [[NEWADDR1:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<f32> -> !fir.ref<f32>
+
+    !$omp parallel
+!FIRDialect-DAG:    [[ADDR2:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.array<24xi8>> -> !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:    [[ADDR3:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<f32> -> !fir.ref<f32>
+!FIRDialect-DAG:    [[ADDR4:%.*]] = fir.convert [[ADDR2]] : (!fir.ref<!fir.array<24xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR5:%.*]] = fir.coordinate_of [[ADDR4]], %{{.*}} : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR6:%.*]] = fir.convert [[ADDR5:%.*]] : (!fir.ref<i8>) -> !fir.ref<i32>
+!FIRDialect-DAG:    [[ADDR7:%.*]] = fir.convert [[ADDR2]] : (!fir.ref<!fir.array<24xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR8:%.*]] = fir.coordinate_of [[ADDR7]], %{{.*}} : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR9:%.*]] = fir.convert [[ADDR8:%.*]] : (!fir.ref<i8>) -> !fir.ref<!fir.array<5xf32>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR6]] : !fir.ref<i32>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR3]] : !fir.ref<f32>
+!FIRDialect-DAG:    %{{.*}} = fir.embox [[ADDR9]](%{{.*}}) : (!fir.ref<!fir.array<5xf32>>, !fir.shape<1>) -> !fir.box<!fir.array<5xf32>>
+      print *, x, y, z
+    !$omp end parallel
+  end
+end
+
+program main
+  use test
+  integer :: x1
+  real :: z1(5)
+  common /blk/ x1, z1
+
+  !$omp threadprivate(/blk/)
+
+  call sub()
+
+! FIRDialect-LABEL: @_QQmain()
+!FIRDialect-DAG:  [[ADDR0:%.*]] = fir.address_of(@_QBblk) : !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:  [[NEWADDR0:%.*]] = omp.threadprivate [[ADDR0]] : !fir.ref<!fir.array<24xi8>> -> !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:  [[ADDR1:%.*]] = fir.address_of(@_QBblk) : !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:  [[NEWADDR1:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.array<24xi8>> -> !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:  [[ADDR2:%.*]] = fir.address_of(@_QMtestEy) : !fir.ref<f32>
+!FIRDialect-DAG:  [[NEWADDR2:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<f32> -> !fir.ref<f32>
+
+  !$omp parallel
+!FIRDialect-DAG:    [[ADDR4:%.*]] = omp.threadprivate [[ADDR1]] : !fir.ref<!fir.array<24xi8>> -> !fir.ref<!fir.array<24xi8>>
+!FIRDialect-DAG:    [[ADDR5:%.*]] = omp.threadprivate [[ADDR2]] : !fir.ref<f32> -> !fir.ref<f32>
+!FIRDialect-DAG:    [[ADDR6:%.*]] = fir.convert [[ADDR4]] : (!fir.ref<!fir.array<24xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR7:%.*]] = fir.coordinate_of [[ADDR6]], %{{.*}} : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR8:%.*]] = fir.convert [[ADDR7:%.*]] : (!fir.ref<i8>) -> !fir.ref<i32>
+!FIRDialect-DAG:    [[ADDR9:%.*]] = fir.convert [[ADDR4]] : (!fir.ref<!fir.array<24xi8>>) -> !fir.ref<!fir.array<?xi8>>
+!FIRDialect-DAG:    [[ADDR10:%.*]] = fir.coordinate_of [[ADDR9]], %{{.*}} : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
+!FIRDialect-DAG:    [[ADDR11:%.*]] = fir.convert [[ADDR10:%.*]] : (!fir.ref<i8>) -> !fir.ref<!fir.array<5xf32>>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR8]] : !fir.ref<i32>
+!FIRDialect-DAG:    %{{.*}} = fir.load [[ADDR5]] : !fir.ref<f32>
+!FIRDialect-DAG:    %{{.*}} = fir.embox [[ADDR11]](%{{.*}}) : (!fir.ref<!fir.array<5xf32>>, !fir.shape<1>) -> !fir.box<!fir.array<5xf32>>
+    print *, x1, y, z1
+  !$omp end parallel
+
+end

mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp

 };
 
 template <typename T>
 struct RegionLessOpConversion : public ConvertOpToLLVMPattern<T> {
   using ConvertOpToLLVMPattern<T>::ConvertOpToLLVMPattern;
   LogicalResult
   matchAndRewrite(T curOp, typename T::Adaptor adaptor,
                   ConversionPatternRewriter &rewriter) const override {
-    rewriter.replaceOpWithNewOp<T>(curOp, TypeRange(), adaptor.getOperands(),
+    TypeConverter *converter = ConvertToLLVMPattern::getTypeConverter();
+    SmallVector<Type> resTypes;
+    if (failed(converter->convertTypes(curOp->getResultTypes(), resTypes)))
+      return failure();
+    rewriter.replaceOpWithNewOp<T>(curOp, resTypes, adaptor.getOperands(),
                                    curOp->getAttrs());
     return success();
   }
 };
 } // namespace
 
 void mlir::configureOpenMPToLLVMConversionLegality(
     ConversionTarget &target, LLVMTypeConverter &typeConverter) {
   target.addDynamicallyLegalOp<mlir::omp::ParallelOp, mlir::omp::WsLoopOp,
                                mlir::omp::MasterOp>(
       [&](Operation *op) { return typeConverter.isLegal(&op->getRegion(0)); });
   target
-      .addDynamicallyLegalOp<mlir::omp::AtomicReadOp, mlir::omp::AtomicWriteOp>(
-          [&](Operation *op) {
-            return typeConverter.isLegal(op->getOperandTypes());
-          });
+      .addDynamicallyLegalOp<mlir::omp::AtomicReadOp, mlir::omp::AtomicWriteOp,
+                             mlir::omp::ThreadprivateOp>([&](Operation *op) {
 }
 
 void mlir::populateOpenMPToLLVMConversionPatterns(LLVMTypeConverter &converter,
                                                   RewritePatternSet &patterns) {
   patterns.add<RegionOpConversion<omp::MasterOp>,
                RegionOpConversion<omp::ParallelOp>,
                RegionOpConversion<omp::WsLoopOp>,
                RegionLessOpConversion<omp::AtomicReadOp>,
-               RegionLessOpConversion<omp::AtomicWriteOp>>(converter);
+               RegionLessOpConversion<omp::AtomicWriteOp>,
+               RegionLessOpConversion<omp::ThreadprivateOp>>(converter);
 }
 
 namespace {
 struct ConvertOpenMPToLLVMPass
     : public ConvertOpenMPToLLVMBase<ConvertOpenMPToLLVMPass> {
   void runOnOperation() override;
 };
 } // namespace