Adjust CS names

Summary:
Ref T16509
TF2.4 Only

Test Plan: CI

Reviewers: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, simonl, vladimirm, samuelh

Reviewed By: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, vladimirm, samuelh

Subscribers: samuelh

Maniphest Tasks: T16509

Differential Revision: https://phabricator.sourcevertex.net/D49178

Author: georgepaw

tensorflow/compiler/plugin/poplar/tests/fuse_ops_test.py

@@ -839,7 +839,6 @@ def network(x, y1, y2):
         '__seed*',
         '/negate/Op/Negate',
         'ExpandDims/input/multi-update-add.3/multiUpdateAdd',
-        'ExpandDims/input/multi-update-add.3/multiUpdateAdd/*/Fill',
         '[cC]opy*/OnTileCopy',
         'vs/Gather*/multi-slice',
         'vs/add/add*/Add',
@@ -906,7 +905,6 @@ def network(x, y1, y2, lr):
         '__seed*',
         '/negate/Op/Negate',
         'ExpandDims/input/multi-update-add.3/multiUpdateAdd',
-        'ExpandDims/input/multi-update-add.3/multiUpdateAdd/*/Fill',
         '[cC]opy*/OnTileCopy',
         'vs/Gather*/multi-slice',
         'vs/add/add*/Add',
@@ -967,15 +965,13 @@ def network(x, y, la, lr):
         'GradientDescent/update_vs/w/Neg/negate*/Op/Negate',
         'GradientDescent/update_vs/w/mul/fusion*/Op/Multiply',
         'GradientDescent/update_vs/w/ResourceScatterAdd/multi-update-add*/multiUpdateAdd',
-        'GradientDescent/update_vs/w/ResourceScatterAdd/multi-update-add*/multiUpdateAdd/*/Fill',
         'gradients/vs/absolute_difference/Abs_grad/Sign',
         'gradients/vs/absolute_difference/Abs_grad/mul/fusion',
         'vs/embedding_lookup/multi-slice',
         'vs/absolute_difference/Sub/subtract.*/Subtract',
         'vs/absolute_difference/Abs/abs.*/Op/Absolute',
         'vs/absolute_difference/Sum/reduce',
         'vs/absolute_difference/value/multiply',
-        'host-exchange-local-copy-*/OnTileCopy-0',
     ]
     # pylint: enable=line-too-long
     self.assert_all_compute_sets_and_list(report, ok)
@@ -1034,12 +1030,12 @@ def network(x, y1, y2, la, lr):
     report = pva.openReport(report_helper.find_report())
     # pylint: disable=line-too-long
     ok = [
+        '[cC]opy',
         '__seed*',
         'gradients/vs/absolute_difference/Abs_grad/Sign',
         'gradients/vs/absolute_difference/Abs_grad/mul/fusion',
         '/negate/Op/Negate',
         'gradients/vs/Reshape_grad/UnsortedSegmentSum/multi-update-add*/multiUpdateAdd',
-        'gradients/vs/Reshape_grad/UnsortedSegmentSum/multi-update-add*/multiUpdateAdd/*/Fill',
         'vs/embedding_lookup*/multi-slice',
         'vs/absolute_difference/Sub/subtract.*/Subtract',
         'vs/absolute_difference/Abs/abs.*/Op/Absolute',

tensorflow/compiler/plugin/poplar/tests/gather_simplifier_embedding_lookup_test.py

@@ -87,10 +87,9 @@ def network(w, y):
     ok = [
         'embedding_lookup/multi-slice/output/multiSlice/*',
         '__seed/set/setMasterSeed',
-        'host-exchange-local-copy-',
     ]
     # pylint: enable=line-too-long
-    self.assert_all_compute_sets_and_list(report, ok)
+    self.assert_compute_sets_contain_list(report, ok)
 
 
 if __name__ == "__main__":