From 3cae0b7649dd3448bf996bbcc5132b1a3fb3c76c Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Tue, 30 Jun 2020 18:10:25 -0400 Subject: [PATCH] Fix -Wmissing-braces Change-Id: I2394b6923c789f36e72242f4b196844cc0ee90ba [ROCm/clr commit: 5577eabcea760437ba6125e1f1c0f3cc2ab75f93] --- projects/clr/rocclr/device/rocm/rocvirtual.cpp | 4 ++-- projects/clr/rocclr/platform/activity.hpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/clr/rocclr/device/rocm/rocvirtual.cpp b/projects/clr/rocclr/device/rocm/rocvirtual.cpp index 7a25670b5d..cb2702c057 100644 --- a/projects/clr/rocclr/device/rocm/rocvirtual.cpp +++ b/projects/clr/rocclr/device/rocm/rocvirtual.cpp @@ -84,10 +84,10 @@ static const uint16_t kBarrierPacketReleaseHeader = (HSA_FENCE_SCOPE_SYSTEM << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE); static const hsa_barrier_and_packet_t kBarrierAcquirePacket = { - kBarrierPacketAcquireHeader, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + kBarrierPacketAcquireHeader, 0, 0, {{0}}, 0, {0}}; static const hsa_barrier_and_packet_t kBarrierReleasePacket = { - kBarrierPacketReleaseHeader, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + kBarrierPacketReleaseHeader, 0, 0, {{0}}, 0, {0}}; double Timestamp::ticksToTime_ = 0; diff --git a/projects/clr/rocclr/platform/activity.hpp b/projects/clr/rocclr/platform/activity.hpp index eaa65e72b4..2a6701cb55 100644 --- a/projects/clr/rocclr/platform/activity.hpp +++ b/projects/clr/rocclr/platform/activity.hpp @@ -132,8 +132,12 @@ class ActivityProf { record_id_, // activity correlation id begin_ts, // begin timestamp, ns end_ts, // end timestamp, ns - static_cast(device_id_), // device id - queue_id_, // queue id + { + { + static_cast(device_id_), // device id + queue_id_ // queue id + } + }, bytes // copied data size, for memcpy }; (CallbacksTable::get_op_callback())(op_id, &record, CallbacksTable::get_arg());