From 0254bda1204d5c064e970d481dbce455bd4a72ac Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Fri, 25 Aug 2023 13:31:48 +0100 Subject: [PATCH 1/2] [SYCL][Graphs] Correct assert usage Fix [macOS CI fail in post-commit CI] (https://github.com/intel/llvm/actions/runs/5975037762/job/16210261083) by asserting on `false`, then providing the error string. ``` /Users/runner/work/llvm/llvm/src/sycl/source/detail/graph_impl.cpp:140:16: error: implicit conversion turns string literal into bool: 'const char[55]' to 'bool' [-Werror,-Wstring-conversion] assert("Node duplication failed. A duplicated node is missing."); ~~~~~~~^~~~~~~~~~~~~~~~~~~ ``` --- sycl/source/detail/graph_impl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sycl/source/detail/graph_impl.cpp b/sycl/source/detail/graph_impl.cpp index aa51eb9d0c44c..6574bc0f48dea 100644 --- a/sycl/source/detail/graph_impl.cpp +++ b/sycl/source/detail/graph_impl.cpp @@ -137,7 +137,8 @@ std::shared_ptr graph_impl::addSubgraphNodes( auto Successor = NodesMap[NextNode]; NodeCopy->registerSuccessor(Successor, NodeCopy); } else { - assert("Node duplication failed. A duplicated node is missing."); + assert(false && + "Node duplication failed. A duplicated node is missing."); } } } From 31df6da3f7d0834dbb9ee44e18ca814f4b8ad514 Mon Sep 17 00:00:00 2001 From: Pablo Reble Date: Fri, 25 Aug 2023 22:38:32 -0500 Subject: [PATCH 2/2] [SYCL][Graph] Replacing assert by use of at function Addresses https://github.com/intel/llvm/pull/10969#discussion_r1306048912 --- sycl/source/detail/graph_impl.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sycl/source/detail/graph_impl.cpp b/sycl/source/detail/graph_impl.cpp index 6574bc0f48dea..353bca100ce4c 100644 --- a/sycl/source/detail/graph_impl.cpp +++ b/sycl/source/detail/graph_impl.cpp @@ -133,13 +133,8 @@ std::shared_ptr graph_impl::addSubgraphNodes( *NewNodesIt = NodeCopy; NodesMap.insert({Node, NodeCopy}); for (auto &NextNode : Node->MSuccessors) { - if (NodesMap.find(NextNode) != NodesMap.end()) { - auto Successor = NodesMap[NextNode]; - NodeCopy->registerSuccessor(Successor, NodeCopy); - } else { - assert(false && - "Node duplication failed. A duplicated node is missing."); - } + auto Successor = NodesMap.at(NextNode); + NodeCopy->registerSuccessor(Successor, NodeCopy); } }