[flang] Google test infrastructure support for unittests

[sameeranjoshi]

Summary

Adds google test infrastructure support for in tree and out-of-tree.
Updates README.
Adds new target `check-flang-unit`

[sameeranjoshi]

This comment was removed by sameeranjoshi.

[tskeith]

Would you pleave update the build and test instructions in flang/README.md?

[sameeranjoshi]

Builds and tests work fine.
README updated.

[tskeith]

When I try to build I get this error:

ld: library not found for -lgtest_main

Please update the README to indicate how to do the correct setup. A link to elsewhere in LLVM is fine.

flang/README.md

168 ↗

(On Diff #265675)

How do you run unit tests for out-of-tree builds?

[sameeranjoshi]

In D80377#2051051, @tskeith wrote:

When I try to build I get this error:

ld: library not found for -lgtest_main

From a cursory look #include <gtest/gtest.h>should have been #include "gtest/gtest.h". As I had gtest package installed.

[sameeranjoshi]

In D80377#2051051, @tskeith wrote:

When I try to build I get this error:

ld: library not found for -lgtest_main

Please update the README to indicate how to do the correct setup. A link to elsewhere in LLVM is fine.

I tried twice building the compiler in-tree on 2 different m/c. I couldn't reproduce the issue, here's how my cmake looks like:

cmake -G "Ninja"  -DCMAKE_INSTALL_PREFIX=../install/  -DCMAKE_BUILD_TYPE="Release"  -DLLVM_TARGETS_TO_BUILD=host -DLLVM_ENABLE_PROJECTS="mlir;flang" -DCMAKE_CXX_STANDARD=17 -DFLANG_INCLUDE_TESTS=ON ../llvm-project/llvm/

[tskeith]

In D80377#2051422, @sameeranjoshi wrote:

In D80377#2051051, @tskeith wrote:

When I try to build I get this error:

ld: library not found for -lgtest_main

Please update the README to indicate how to do the correct setup. A link to elsewhere in LLVM is fine.

I tried twice building the compiler in-tree on 2 different m/c. I couldn't reproduce the issue, here's how my cmake looks like:

cmake -G "Ninja"  -DCMAKE_INSTALL_PREFIX=../install/  -DCMAKE_BUILD_TYPE="Release"  -DLLVM_TARGETS_TO_BUILD=host -DLLVM_ENABLE_PROJECTS="mlir;flang" -DCMAKE_CXX_STANDARD=17 -DFLANG_INCLUDE_TESTS=ON ../llvm-project/llvm/

Where is it finding the gtest_main library? Is it built as part of llvm or coming from outside?

[sameeranjoshi]

In D80377#2052113, @tskeith wrote:

In D80377#2051422, @sameeranjoshi wrote:

In D80377#2051051, @tskeith wrote:

When I try to build I get this error:

ld: library not found for -lgtest_main

Please update the README to indicate how to do the correct setup. A link to elsewhere in LLVM is fine.

I tried twice building the compiler in-tree on 2 different m/c. I couldn't reproduce the issue, here's how my cmake looks like:

cmake -G "Ninja"  -DCMAKE_INSTALL_PREFIX=../install/  -DCMAKE_BUILD_TYPE="Release"  -DLLVM_TARGETS_TO_BUILD=host -DLLVM_ENABLE_PROJECTS="mlir;flang" -DCMAKE_CXX_STANDARD=17 -DFLANG_INCLUDE_TESTS=ON ../llvm-project/llvm/

Where is it finding the gtest_main library? Is it built as part of llvm or coming from outside?

Googletest is built with LLVM, source should be in llvm-project/llvm/utils/unittest/googletest

[sameeranjoshi]

In D80377#2052113, @tskeith wrote:

In D80377#2051422, @sameeranjoshi wrote:

In D80377#2051051, @tskeith wrote:

When I try to build I get this error:

ld: library not found for -lgtest_main

Please update the README to indicate how to do the correct setup. A link to elsewhere in LLVM is fine.

I tried twice building the compiler in-tree on 2 different m/c. I couldn't reproduce the issue, here's how my cmake looks like:

cmake -G "Ninja"  -DCMAKE_INSTALL_PREFIX=../install/  -DCMAKE_BUILD_TYPE="Release"  -DLLVM_TARGETS_TO_BUILD=host -DLLVM_ENABLE_PROJECTS="mlir;flang" -DCMAKE_CXX_STANDARD=17 -DFLANG_INCLUDE_TESTS=ON ../llvm-project/llvm/

Where is it finding the gtest_main library? Is it built as part of llvm or coming from outside?

Googletest is built with LLVM, source should be in llvm-project/llvm/utils/unittest/googletest

In D80377#2052155, @sameeranjoshi wrote:

In D80377#2052113, @tskeith wrote:

In D80377#2051422, @sameeranjoshi wrote:

In D80377#2051051, @tskeith wrote:

When I try to build I get this error:

ld: library not found for -lgtest_main

Please update the README to indicate how to do the correct setup. A link to elsewhere in LLVM is fine.

I tried twice building the compiler in-tree on 2 different m/c. I couldn't reproduce the issue, here's how my cmake looks like:

cmake -G "Ninja"  -DCMAKE_INSTALL_PREFIX=../install/  -DCMAKE_BUILD_TYPE="Release"  -DLLVM_TARGETS_TO_BUILD=host -DLLVM_ENABLE_PROJECTS="mlir;flang" -DCMAKE_CXX_STANDARD=17 -DFLANG_INCLUDE_TESTS=ON ../llvm-project/llvm/

Where is it finding the gtest_main library? Is it built as part of llvm or coming from outside?

Googletest is built with LLVM, source should be in llvm-project/llvm/utils/unittest/googletest

Also you should try considering below commit in fir-dev.
https://github.com/flang-compiler/f18-llvm-project/pull/91

This would add the check-flang-unit target, without the FIR dependency, so the other pending post merge task
https://github.com/flang-compiler/f18/issues/995
could not have a blocker.

And the out-of-tree building would still fail as there are issues in building flang with out of tree with FLANG_INCLUDE_TESTS=ON, that's the reason I didn't mention in README

[tskeith]

Where is it finding the gtest_main library? Is it built as part of llvm or coming from outside?

Googletest is built with LLVM, source should be in llvm-project/llvm/utils/unittest/googletest

Where is gtest_main found in your build?

[sameeranjoshi]

In D80377#2052243, @tskeith wrote:

Where is it finding the gtest_main library? Is it built as part of llvm or coming from outside?

Googletest is built with LLVM, source should be in llvm-project/llvm/utils/unittest/googletest

Where is gtest_main found in your build?

It's in build/lib/libgtest_main.a

[tskeith]

Where is gtest_main found in your build?

It's in build/lib/libgtest_main.a

Thanks, I found the problem: I had LLVM_INCLUDE_TESTS set to Off and apparently it must be On for gtest to get built.
So the cmake files should either force it to be on when FLANG_INCLUDE_TESTS is on, or report a fatal error when they are set inconsistently.

[kiranchandramohan]

Thanks @sameeranjoshi for working on this.

check-flang-unit works for me with ninja on Ubuntu Linux on AArch64 in-tree build.

Please wait for @tskeith to approve.

flang/CMakeLists.txt

132 ↗

(On Diff #265675)

1. Does this mean that the flang unit tests cannot be controlled using LLVM_INCLUDE_TESTS?
2. Do you know why Clang/LLVM has unittests set to OFF by default?

[richard.barton.arm]

flang/CMakeLists.txt

132 ↗

(On Diff #265675)

I don't think this is right. LLVM_INCLUDE_TESTS is On by default according to llvm/docs/CMake.rst. LLVM so we should be able to keep the original code. This is what the other LLVM sub-projects seem to do, i.e. give you a local toggle for the unit tests of the sub-project, but default to the global setting for unit tests.

Note there is LLVM_BUILD_TESTS, which defaults to OFF, that excludes the tests from the all target. This means the unittests will be built only on make check-all rather than on make.

[richard.barton.arm]

I think the code to handle the issue that @tskeith points out in clang standalone builds is here https://github.com/llvm/llvm-project/blob/master/clang/CMakeLists.txt#L187. The key is to add a dependency on the utils/unittest directory.

There is also a GTest format that should be set in the lit.cfg https://github.com/llvm/llvm-project/blob/master/clang/test/Unit/lit.cfg.py#L24.

flang/test/Unit/lit.cfg.py

30 ↗

(On Diff #265675)

Why is LLVM_SRC_ROOT needed for the tests?

33 ↗

(On Diff #265675)

Other sub-projects set this up in top-level CMakeLists using FindPythonInterp. Why do we set it here?

[schweitz]

flang/test/Unit/lit.cfg.py

33 ↗

(On Diff #265675)

Sameeran was pulling this glue code from the lld subproject, where these config settings are made. They can probably be deleted here. I do not appear to be used, but I haven't tested it.

[schweitz]

flang/CMakeLists.txt

132 ↗

(On Diff #265675)

Agreed. This should not be changed.

[sameeranjoshi]

All the changes were made for handling out-of-tree errors, no changes in in-tree handling code.

1. Some changes were ported from fir-dev to resolve out-of-tree errors and some API changes which were bugs and merged in fir-dev .
2. A sample gtest is added.
3. Changes in Cmake to support out-of-tree builds of unittests
4. README updated for out-of-tree setup

note: check-flang-unit won't work for out-of-tree till D81002 is merged.

[tskeith]

It seems to me there is something wrong with this patch. The paths are relative to flang/ rather that the root of the repo so the patch doesn't apply successfully. Or maybe there is something I'm missing about how phabricator works?

[DavidTruby]

In D80377#2068956, @tskeith wrote:

It seems to me there is something wrong with this patch. The paths are relative to flang/ rather that the root of the repo so the patch doesn't apply successfully. Or maybe there is something I'm missing about how phabricator works?

The root of the repo is llvm-project, of which flang is a subdirectory. The patch seems incorrect to me too on that basis.

[sameeranjoshi]

In D80377#2068956, @tskeith wrote:

It seems to me there is something wrong with this patch. The paths are relative to flang/ rather that the root of the repo so the patch doesn't apply successfully. Or maybe there is something I'm missing about how phabricator works?

Sorry I made a mistake. I was working out-of tree and that caused me to think in usual way when updating diff.
Please check this and thanks for pointing.

[tskeith]

flang/CMakeLists.txt

128 ↗

(On Diff #267924)

Why do you have to check for gtest.h? Won't it always be there?

129 ↗

(On Diff #267924)

Same question. Why do you have to check this?

flang/include/flang/Optimizer/Support/InternalNames.h

68 ↗

(On Diff #267924)

This doesn't look properly formatted. Is it part of your change?

flang/runtime/io-error.cpp

10 ↗

(On Diff #267924)

Is this supposed to be part of your change?

[sameeranjoshi]

flang/runtime/io-error.cpp

10 ↗

(On Diff #267924)

Yes, out-of-tree builds fail with this include.
Also see this commit addressing the same
https://github.com/flang-compiler/f18-llvm-project/commit/4069068c997812c1c8ef6434a5e630603c7232e0

[sameeranjoshi]

flang/CMakeLists.txt

128 ↗

(On Diff #267924)

Not always because

The out-of-tree build can be configured against the CMAKE_INSTALL_PREFIX directory of llvm, rather than the build directory.
LLVM does not install gtest when installing itself, meaning that gtest might not be available.

Also other subprojects as well follow something similar
[1]https://github.com/llvm/llvm-project/blob/8e058feae0b0d07cd86257f0aa3154acfa887fe0/clang/CMakeLists.txt#L188
[2]https://github.com/llvm/llvm-project/blob/82aac878beb48cd326b4684918b7ff2375fae439/polly/CMakeLists.txt#L29
[3]https://github.com/llvm/llvm-project/blob/82aac878beb48cd326b4684918b7ff2375fae439/lld/CMakeLists.txt#L109

flang/include/flang/Optimizer/Support/InternalNames.h

68 ↗

(On Diff #267924)

Yes it is.
I will format it.
This was a bug fixed in fir-dev[1] just porting it here.
https://github.com/flang-compiler/f18-llvm-project/pull/87/files

flang/test/Unit/lit.cfg.py

33 ↗

(On Diff #265675)

Removed them as they are not used currently.

[tskeith]

flang/CMakeLists.txt

128 ↗

(On Diff #267924)

If the user requests unit tests and we can't run them it should be an error, not silently ignored.

flang/include/flang/Optimizer/Support/InternalNames.h

68 ↗

(On Diff #267924)

This should be in a separate change. It has nothing to do with google test infrastructure.

flang/runtime/io-error.cpp

10 ↗

(On Diff #267924)

This should be in a separate change. It has nothing to do with google test infrastructure.

The include of config.h was added for a reason. Does that reason no longer apply or are you breaking something else by changing this?

[sameeranjoshi]

flang/runtime/io-error.cpp

10 ↗

(On Diff #267924)

I could build and test successfully with removing this file for out of tree and in tree.
Can you mention what does "something else" mean here or for what specific reason was this added ?

[tskeith]

flang/runtime/io-error.cpp

10 ↗

(On Diff #267924)

You can answer this question with git log:

commit ea5efd1ea87e3d6b86a8e7f940f94dec0a90a004
Author: Isuru Fernando <[e-mail]>
Date:   Thu Mar 12 15:28:35 2020 -0500

    [flang] Support platforms without strerror_r

    Original-commit: flang-compiler/f18@0575b54cc79110ae03f73b136e704f6313e2d63f
    Reviewed-on: https://github.com/flang-compiler/f18/pull/1068

[sameeranjoshi]

flang/runtime/io-error.cpp

10 ↗

(On Diff #267924)

Addressed by https://reviews.llvm.org/D81266
Thanks @isuruf

[sameeranjoshi]

@tskeith are these changes what you expect?
Is that ready to merge?

[Meinersbur]

flang/CMakeLists.txt

128 ↗

(On Diff #267924)

If the user is running make FlangUnitTests, yes. The build target may not exist in this case. But failing on make check-flang would mean the build cannot be verified at all if configuring against a pre-installed LLVM. If not supported, I would question the point of a flang standalone build.

Note that it is never possible to run all tests all the time since some tests have requirements, such as running on Windows. A warning about skipped tests might be useful though.

[tskeith]

flang/CMakeLists.txt

155 ↗

(On Diff #269340)

I get this. Is it what you're expecting?

CMake Error at CMakeLists.txt:164 (message):
  gtest.h is missing from /utils/unittest/googletest/include/gtest

flang/README.md

168 ↗

(On Diff #269340)

Somewhere in here you should explain that you can't run unit tests in an out-of-tree build against an LLVM install.

[sameeranjoshi]

flang/CMakeLists.txt

128 ↗

(On Diff #267924)

Agreed that a warning is useful.

What if we use CMake to download GoogleTest as part of the build's configure step[1] specifically for standalone builds? It definitely would increase configuration time, but we are assured the unit tests they run perfectly well.

[1]https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project

[tskeith]

flang/CMakeLists.txt

128 ↗

(On Diff #267924)

I think it would make more sense to install GoogleTest as part of the LLVM install, as it currently done with testing tools like llvm-lit and FileCheck. Then this should work the same whether built against a build or install of LLVM. If you decide to do this it should be a separate change.

In the meantime, a meaningful warning is fine with me.

[sameeranjoshi]

@tskeith is that ready to merge?
I have addressed the comments.

[schweitz]

Have whatever changes made here been propagated to the fir-dev branch? I don't want to try to decipher which changes are needed, why things fail (if they do), etc.

[richard.barton.arm]

The status of the fir-dev branch has no bearing on this patch review.

If @sameeranjoshi wants to update fir-dev after pushing this change to master then that is up to him, but that should not in any way block committing the code to master.

[tskeith]

It would be good if someone who understand cmake reviews this.

[DavidTruby]

flang/CMakeLists.txt

160 ↗

(On Diff #270037)

I think it's better to use CMake's find_package(Threads) support here, so that this is more likely work on platforms without pthreads.
See: https://cmake.org/cmake/help/v3.8/module/FindThreads.html

[DavidTruby]

My above comment was just a small nit, I'm happy to approve this either way

[isuruf]

I'd like to see the -lpthread issue getting fixed before merging this.

[sameeranjoshi]

@isuruf done.

[sameeranjoshi]

Formatting issue fixed.

[isuruf]

flang/CMakeLists.txt

132 ↗

(On Diff #270448)

Is the variable LLVM_INCLUDE_TESTS set in a out-of-tree build?

[sameeranjoshi]

flang/CMakeLists.txt

132 ↗

(On Diff #270448)

For an out-of-tree build of flang the user is supposed to set FLANG_INCLUDE_TESTS if he wants a local toggle for the unit tests of sub project(flang in this case).

Now LLVM_INCLUDE_TESTS depends on how LLVM was built, but by default LLVM_INCLUDE_TESTS is ON.
In case, if LLVM_INCLUDE_TESTS was OFF still the user of out-of-tree build of flang can get unit-tests using the local toggle of FLANG_INCLUDE_TESTS.

Can read more on this on my older revision[1]
[1] https://reviews.llvm.org/D80377#2054070

[isuruf]

flang/CMakeLists.txt

132 ↗

(On Diff #270448)

LLVM_INCLUDE_TESTS is not set to any value in an out-of-tree build. It's only set if you are doing an in-tree build.

[sameeranjoshi]

flang/CMakeLists.txt

132 ↗

(On Diff #270448)

so @isuruf what should be the take on this?
Do you want me to set it to ON always for out-of-tree?

[awarzynski]

flang/CMakeLists.txt

132 ↗

(On Diff #270448)

This patch seems to be ready for in-tree testing, which is great! We are keen to start adding unit tests - could the discussion about out-of-tree testing be moved to a separate patch? Ta!

[sameeranjoshi]

@isuruf I have set FLANG_INCLUDE_TESTS to ON by default for out-of-tree builds.
If there are still any concerns I can fix in other PR.

@awarzynski I have merged changes[1]

[1] https://github.com/llvm/llvm-project/commit/93f602b339f62e058ce2c212c86f9f0ca3b20126

[kiranchandramohan]

@sameeranjoshi, the llvm commit process recommends that you add the Differential Revision message to your commit message. This will also automatically close the patch in review.
https://llvm.org/docs/Phabricator.html#committing-a-change

[awarzynski]

@awarzynski I have merged changes[1]

@sameeranjoshi Thank you, much appreciated!

CMakeLists.txt

project(Flang)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
     ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
 
   set(BACKEND_PACKAGE_STRING "LLVM ${LLVM_PACKAGE_VERSION}")
   set(LLVM_EXTERNAL_LIT "${LLVM_TOOLS_BINARY_DIR}/llvm-lit" CACHE STRING "Command used to spawn lit")
 
   option(FLANG_INCLUDE_TESTS
          "Generate build targets for the Flang unit tests."
-         ON)
-  add_custom_target(check-all DEPENDS check-flang)
+         ${LLVM_INCLUDE_TESTS})
+
+#Handle unittests when out-of-tree
+#LLVM_BUILD_MAIN_SRC_DIR - Path to llvm source when out-of-tree.
+  set(UNITTEST_DIR ${LLVM_BUILD_MAIN_SRC_DIR}/utils/unittest)
+  if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
+    if (TARGET gtest)
+      # LLVM Doesn't export gtest's include directorys, so do that here
+      set_target_properties(gtest
+        PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+        "${UNITTEST_DIR}/googletest/include;${UNITTEST_DIR}/googlemock/include"
+        )
+    else()
+      add_library(gtest
+        ${UNITTEST_DIR}/googletest/src/gtest-all.cc
+        ${UNITTEST_DIR}/googlemock/src/gmock-all.cc
+        )
+      target_include_directories(gtest
+        PUBLIC
+        "${UNITTEST_DIR}/googletest/include"
+        "${UNITTEST_DIR}/googlemock/include"
+
+        PRIVATE
+        "${UNITTEST_DIR}/googletest"
+        "${UNITTEST_DIR}/googlemock"
+        )
+      target_link_libraries(gtest PUBLIC -lpthread)
+
+      add_library(gtest_main ${UNITTEST_DIR}/UnitTestMain/TestMain.cpp)
+      target_link_libraries(gtest_main PUBLIC gtest)
+    endif()
+  endif()
+
+  add_custom_target(check-all DEPENDS check-flang FlangUnitTests)
   if (LLVM_BUILD_DOCS)
     add_custom_target(doxygen ALL)
   endif()
 
 else()
   option(FLANG_INCLUDE_TESTS
          "Generate build targets for the Flang unit tests."
          ${LLVM_INCLUDE_TESTS})

README.md

 Release builds execute quickly.
 
 ### Build Flang out of tree
 ```
 cd ~/flang/build
 cmake -DLLVM_DIR=$LLVM -DMLIR_DIR=$MLIR ~/flang/src
 make
 ```
-### How to Run the Regression Tests
+# How to Run Tests
 
+Flang supports 2 different categories of tests
+1. Regression tests (https://www.llvm.org/docs/TestingGuide.html#regression-tests)
+2. Unit tests (https://www.llvm.org/docs/TestingGuide.html#unit-tests)
+
+## For out of tree builds
 To run all tests:
 ```
 cd ~/flang/build
 cmake -DLLVM_DIR=$LLVM -DMLIR_DIR=$MLIR ~/flang/src
 make test check-all
 ```
 
 To run individual regression tests llvm-lit needs to know the lit
 configuration for flang. The parameters in charge of this are:
 flang_site_config and flang_config. And they can be set as shown bellow:
 ```
 <path-to-llvm-lit>/llvm-lit \
  --param flang_site_config=<path-to-flang-build>/test-lit/lit.site.cfg.py \
  --param flang_config=<path-to-flang-build>/test-lit/lit.cfg.py \
   <path-to-fortran-test>
+
+```
+
+Unit tests:
+
+If flang was built with `-DFLANG_INCLUDE_TESTS=On` (By default depends on `-DLLVM_INCLUDE_TESTS`), it is possible to
+generate unittests.
+There are various ways to run unit-tests.
+
+```
+
+1. make check-flang-unit
+2. make check-all or make check-flang
+3. <path-to-llvm-lit>/llvm-lit \
+        test/Unit
+4. Invoking tests from <out-of-tree flang build>/unittests/<respective unit test folder>
+
+```
+
+
+## For in tree builds
+If flang was built with `-DFLANG_INCLUDE_TESTS=On` (`On` by default), it is possible to
+generate unittests.
+
+To run all of the flang unit tests use the `check-flang-unit` target:
+```
+make check-flang-unit
+```
+To run all of the flang regression tests use the `check-flang` target:
+```
+make check-flang
 ```
 
 # How to Generate Documentation
 
 ## Generate FIR Documentation
 If flang was built with `-DLINK_WITH_FIR=On` (`On` by default), it is possible to
 generate FIR language documentation by running `make flang-doc`. This will
 create `docs/Dialect/FIRLangRef.md` in flang build directory.
 
 ## Generate Doxygen-based Documentation
 To generate doxygen-style documentation from source code
 - Pass `-DLLVM_ENABLE_DOXYGEN=ON -DFLANG_INCLUDE_DOCS=ON` to the cmake command.
 
 ```
 cd ~/llvm-project/build
 cmake -DLLVM_ENABLE_DOXYGEN=ON -DFLANG_INCLUDE_DOCS=ON ../llvm
 make doxygen-flang
 
 It will generate html in
 
     <build-dir>/tools/flang/docs/doxygen/html # for flang docs
 ```
 
+

include/flang/Optimizer/Support/InternalNames.h

struct NameUniquer {
 
   NameUniquer() = default;
 
   /// Unique a common block name
   std::string doCommonBlock(llvm::StringRef name);
 
   /// Unique a (global) constant name
   std::string doConstant(llvm::ArrayRef<llvm::StringRef> modules,
+             llvm::Optional<llvm::StringRef> host,
                          llvm::StringRef name);
 
   /// Unique a dispatch table name
   std::string doDispatchTable(llvm::ArrayRef<llvm::StringRef> modules,
                               llvm::Optional<llvm::StringRef> host,
                               llvm::StringRef name,
                               llvm::ArrayRef<std::int64_t> kinds);
 

lib/Optimizer/Support/InternalNames.cpp

 
 std::string fir::NameUniquer::doCommonBlock(llvm::StringRef name) {
   std::string result = prefix();
   return result.append("B").append(toLower(name));
 }
 
 std::string
 fir::NameUniquer::doConstant(llvm::ArrayRef<llvm::StringRef> modules,
+                             llvm::Optional<llvm::StringRef> host,
                              llvm::StringRef name) {
   std::string result = prefix();
-  return result.append(doModules(modules)).append("EC").append(toLower(name));
+  result.append(doModulesHost(modules, host)).append("EC");
+  return result.append(toLower(name));
 }
 
 std::string
 fir::NameUniquer::doDispatchTable(llvm::ArrayRef<llvm::StringRef> modules,
                                   llvm::Optional<llvm::StringRef> host,
                                   llvm::StringRef name,
                                   llvm::ArrayRef<std::int64_t> kinds) {
   std::string result = prefix();

runtime/io-error.cpp

 //===-- runtime/io-error.cpp ------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "io-error.h"
-#include "config.h"
 #include "magic-numbers.h"
 #include "tools.h"
 #include <cerrno>
 #include <cstdarg>
 #include <cstdio>
 #include <cstring>
 
 namespace Fortran::runtime::io {

test/CMakeLists.txt

 # Test runner infrastructure for Flang. This configures the Flang test trees
 # for use by Lit, and delegates to LLVM's lit test handlers.
 
 set(FLANG_INTRINSIC_MODULES_DIR ${FLANG_BINARY_DIR}/include/flang)
 
 set(FLANG_TOOLS_DIR ${FLANG_BINARY_DIR}/bin)
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
 )
 
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
+  MAIN_CONFIG
+  ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py
+)
+
 set(FLANG_TEST_PARAMS
   flang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
 
 set(FLANG_TEST_DEPENDS
   f18 FileCheck count not module_files
 )
 
 if (LINK_WITH_FIR)
   list(APPEND FLANG_TEST_DEPENDS tco)
 endif()
 
+if (FLANG_INCLUDE_TESTS)
+  list(APPEND FLANG_TEST_DEPENDS FlangUnitTests)
+endif()
+
 add_custom_target(flang-test-depends DEPENDS ${FLANG_TEST_DEPENDS})
 
 add_lit_testsuite(check-flang "Running the Flang regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   PARAMS ${FLANG_TEST_PARAMS}
   DEPENDS ${FLANG_TEST_DEPENDS}
 )
 set_target_properties(check-flang PROPERTIES FOLDER "Tests")
 
 add_lit_testsuites(FLANG ${CMAKE_CURRENT_SOURCE_DIR}
   PARAMS ${FLANG_TEST_PARAMS}
   DEPENDS ${FLANG_TEST_DEPENDS})
 

test/Unit/lit.cfg.py

+# -*- Python -*-
+
+# Configuration file for the 'lit' test runner.
+
+import os
+
+import lit.formats
+
+# name: The name of this test suite.
+config.name = 'flang-Unit'
+
+# suffixes: A list of file extensions to treat as test files.
+config.suffixes =  []
+
+# test_source_root: The root path where unit test binaries are located.
+# test_exec_root: The root path where tests should be run.
+config.test_source_root = os.path.join(config.flang_obj_root, 'unittests')
+config.test_exec_root = config.test_source_root
+
+# testFormat: The test format to use to interpret tests.
+config.test_format = lit.formats.GoogleTest(config.llvm_build_mode, 'Tests')
+
+# Tweak the PATH to include the tools dir.
+path = os.path.pathsep.join((config.flang_tools_dir, config.llvm_tools_dir, config.environment['PATH']))
+config.environment['PATH'] = path
+
+path = os.path.pathsep.join((config.flang_libs_dir, config.llvm_libs_dir,
+                              config.environment.get('LD_LIBRARY_PATH','')))
+config.environment['LD_LIBRARY_PATH'] = path
+
+# Propagate PYTHON_EXECUTABLE into the environment
+#config.environment['PYTHON_EXECUTABLE'] = sys.executable
+

test/Unit/lit.site.cfg.py.in

+@LIT_SITE_CFG_IN_HEADER@
+
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.llvm_obj_root = "@LLVM_BINARY_DIR@"
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
+config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
+config.flang_obj_root = "@FLANG_BINARY_DIR@"
+config.flang_src_root = "@FLANG_SOURCE_DIR@"
+config.flang_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
+config.flang_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"
+config.target_triple = "@TARGET_TRIPLE@"
+config.python_executable = "@Python3_EXECUTABLE@"
+
+# Support substitution of the tools and libs dirs with user parameters. This is
+# used when we can't determine the tool dir at configuration time.
+try:
+    config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
+    config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
+    config.llvm_build_mode = config.llvm_build_mode % lit_config.params
+except KeyError as e:
+    key, = e.args
+    lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
+
+# Let the main config do the real work.
+lit_config.load_config(config, "@FLANG_SOURCE_DIR@/test/Unit/lit.cfg.py")

unittests/CMakeLists.txt

+add_custom_target(FlangUnitTests)
+set_target_properties(FlangUnitTests PROPERTIES FOLDER "Flang Unit Tests")
+
+function(add_flang_unittest test_dirname)
+  add_unittest(FlangUnitTests ${test_dirname} ${ARGN})
+endfunction()
+
+add_subdirectory(Optimizer)
 add_subdirectory(Decimal)
 add_subdirectory(Evaluate)
 add_subdirectory(Runtime)

unittests/Optimizer/CMakeLists.txt

+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
+set(LIBS
+  FIRDialect
+  ${dialect_libs}
+)
+
+add_flang_unittest(FlangOptimizerTests
+  InternalNamesTest.cpp
+)
+target_link_libraries(FlangOptimizerTests
+  PRIVATE
+  ${LIBS})

unittests/Optimizer/InternalNamesTest.cpp

+//===- Basic.cpp - InternalNames unit tests ---------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "flang/Optimizer/Support/InternalNames.h"
+#include "gtest/gtest.h"
+
+using namespace fir;
+using namespace llvm;
+
+TEST(genericName, MyTest) {
+  NameUniquer obj;
+  std::string val = obj.doCommonBlock("hello");
+  std::string val2 = "_QBhello";
+  EXPECT_EQ(val, val2);
+}