From 2132906836cf0618e76485c67a60305bf1557ffc Mon Sep 17 00:00:00 2001 From: Arjun P Date: Sun, 26 Dec 2021 13:59:23 +0530 Subject: [PATCH] Revert "[MLIR] Add forgotten directory Support to unittests cmake" This reverts commit 0c553cc1af2e4c14100df6cf4a6fc91987e778e6. This caused a buildbot failure (https://lab.llvm.org/buildbot#builders/197/builds/888). ``` ******************** TEST 'ScudoStandalone-Unit :: ./ScudoUnitTest-aarch64-Test/ScudoCommonTest.ResidentMemorySize' FAILED ******************** Script: -- /home/tcwg-buildbot/worker/clang-aarch64-sve-vla/stage1/projects/compiler-rt/lib/scudo/standalone/tests/./ScudoUnitTest-aarch64-Test --gtest_filter=ScudoCommonTest.ResidentMemorySize -- Note: Google Test filter = ScudoCommonTest.ResidentMemorySize [==========] Running 1 test from 1 test suite. [----------] Global test environment set-up. [----------] 1 test from ScudoCommonTest [ RUN ] ScudoCommonTest.ResidentMemorySize /home/tcwg-buildbot/worker/clang-aarch64-sve-vla/llvm/compiler-rt/lib/scudo/standalone/tests/common_test.cpp:49: Failure Expected: (getResidentMemorySize()) > (OnStart + Size - Threshold), actual: 707358720 vs 943153152 [ FAILED ] ScudoCommonTest.ResidentMemorySize (21709 ms) [----------] 1 test from ScudoCommonTest (21709 ms total) [----------] Global test environment tear-down [==========] 1 test from 1 test suite ran. (21709 ms total) [ PASSED ] 0 tests. [ FAILED ] 1 test, listed below: [ FAILED ] ScudoCommonTest.ResidentMemorySize 1 FAILED TEST ******************** ``` --- mlir/include/mlir/Support/DebugAction.h | 3 ++- mlir/unittests/CMakeLists.txt | 1 - mlir/unittests/Support/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mlir/include/mlir/Support/DebugAction.h b/mlir/include/mlir/Support/DebugAction.h index 4dc04476b583e3..227d213b0ddac4 100644 --- a/mlir/include/mlir/Support/DebugAction.h +++ b/mlir/include/mlir/Support/DebugAction.h @@ -205,7 +205,8 @@ template class DebugAction { /// Provide classof to allow casting between handler types. static bool classof(const DebugActionManager::HandlerBase *handler) { - return handler->getHandlerID() == TypeID::get(); + return handler->getHandlerID() == + TypeID::get::Handler>(); } }; diff --git a/mlir/unittests/CMakeLists.txt b/mlir/unittests/CMakeLists.txt index 2798c443cf98d7..21506862a302c7 100644 --- a/mlir/unittests/CMakeLists.txt +++ b/mlir/unittests/CMakeLists.txt @@ -11,7 +11,6 @@ add_subdirectory(ExecutionEngine) add_subdirectory(Interfaces) add_subdirectory(IR) add_subdirectory(Pass) -add_subdirectory(Support) add_subdirectory(Rewrite) add_subdirectory(TableGen) add_subdirectory(Transforms) diff --git a/mlir/unittests/Support/CMakeLists.txt b/mlir/unittests/Support/CMakeLists.txt index fd1e66205c071f..6616a793ec12fb 100644 --- a/mlir/unittests/Support/CMakeLists.txt +++ b/mlir/unittests/Support/CMakeLists.txt @@ -7,4 +7,4 @@ add_mlir_unittest(MLIRSupportTests ) target_link_libraries(MLIRSupportTests - PRIVATE MLIRSupport) + PRIVATE MLIRSupportIndentedOstream MLIRSupport)