[SE] Add .clang-format

[jhen]

Summary

The .clang-tidy file is copied from the top-level LLVM source directory
with one change: I removed the misc-noexcept-move-constructor check
because it seemed to be triggering a lot of false positives, and I
didn't think it was necessary because StreamExecutor will usually be
compiled without exceptions enabled.

Also fix warnings generated by clang-format:

• Moved SimpleHostPlatformDevice.h so its header include guard could have the right format.
• Changed signatures of methods taking llvm::Twine by value to take it by const ref instead.
• Removed a bunch of places where single-statement loops and conditionals were surrounded with braces. (This was not found by the current clang-tidy, but with a local patch that I hope to upstream soon.)

[jlebar]

WRT the noexcept check: This is actually relevant even if SE is compiled with exceptions disabled.

If you have a moveable and copyable class with a non-noexcept move constructor and you insert it into a vector, when the vector resizes itself, it will call the copy constructor, not the move constructor. Even if you compile with -fno-exceptions.

It's nuts, I know.

Whether this is something we want to enforce in the SE code or not, I don't know. Apparently it's something we enforce in LLVM only in aspiration. :)

[jlebar]

LGTM as-is, or if you want to add back the noexcept check, that's also fine with me.

[jhen]

• Re-add noexcept move ctor check

[jhen]

I added the noexcept move constructor check back in because I learned how to get rid of false positives. It turns out that the current check won't allow you to explicitly default a noexcept constructor at the same time as you declare it. To get around this, I just moved the explicit default definitions out-of-line. Now we can keep this useful check.

[jlebar]

In D24468#541585, @jhen wrote:

I added the noexcept move constructor check back in because I learned how to get rid of false positives. It turns out that the current check won't allow you to explicitly default a noexcept constructor at the same time as you declare it. To get around this, I just moved the explicit default definitions out-of-line. Now we can keep this useful check.

That...sort of makes sense. There is a subtle difference between =default inside the class definition, which I think means "whatever the compiler will generate by default, including not generating an implementation if it can't," and putting the =default outside the class definition, which means "provide me the default implementation of this function."

.clang-tidy

+Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,readability-identifier-naming'
+CheckOptions:
+  - key:             readability-identifier-naming.ClassCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.EnumCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.FunctionCase
+    value:           lowerCase
+  - key:             readability-identifier-naming.MemberCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.ParameterCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.UnionCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.VariableCase
+    value:           CamelCase
+

streamexecutor/include/streamexecutor/Device.h

public:
   std::string getName() const { return PDevice->getName(); }
 
   /// Creates a kernel object for this device.
   template <typename KernelT>
   Expected<typename std::enable_if<std::is_base_of<KernelBase, KernelT>::value,
                                    KernelT>::type>
   createKernel(const MultiKernelLoaderSpec &Spec) {
     Expected<const void *> MaybeKernelHandle = PDevice->createKernel(Spec);
-    if (!MaybeKernelHandle) {
+    if (!MaybeKernelHandle)
       return MaybeKernelHandle.takeError();
-    }
     return KernelT(PDevice, *MaybeKernelHandle, Spec.getKernelName());
   }
 
   /// Creates a stream object for this device.
   Expected<Stream> createStream();
 
   /// Allocates an array of ElementCount entries of type T in device memory.
   template <typename T>
public:
   /// memory operations.
   ///
   /// Host memory registered by this function can be used for asynchronous
   /// memory copies on streams. See Stream::thenCopyD2H and Stream::thenCopyH2D.
   template <typename T>
   Expected<RegisteredHostMemory<T>>
   registerHostMemory(llvm::MutableArrayRef<T> Memory) {
     if (Error E = PDevice->registerHostMemory(Memory.data(),
-                                              Memory.size() * sizeof(T))) {
+                                              Memory.size() * sizeof(T)))
       return std::move(E);
-    }
     return RegisteredHostMemory<T>(this, Memory.data(), Memory.size());
   }
 
   /// \anchor DeviceHostSyncCopyGroup
   /// \name Host-synchronous device memory copying functions
   ///
   /// These methods block the calling host thread while copying data to or from
   /// device memory. On the device side, these methods do not block any ongoing

streamexecutor/include/streamexecutor/DeviceMemory.h

public:
   GlobalDeviceMemoryBase &operator=(const GlobalDeviceMemoryBase &) = delete;
 
 protected:
   /// Creates a GlobalDeviceMemoryBase from a handle and a byte count.
   GlobalDeviceMemoryBase(Device *D, const void *Handle, size_t ByteCount)
       : TheDevice(D), Handle(Handle), ByteCount(ByteCount) {}
 
   /// Transfer ownership of the underlying handle.
-  GlobalDeviceMemoryBase(GlobalDeviceMemoryBase &&Other)
+  GlobalDeviceMemoryBase(GlobalDeviceMemoryBase &&Other) noexcept
       : TheDevice(Other.TheDevice), Handle(Other.Handle),
         ByteCount(Other.ByteCount) {
     Other.TheDevice = nullptr;
     Other.Handle = nullptr;
     Other.ByteCount = 0;
   }
 
-  GlobalDeviceMemoryBase &operator=(GlobalDeviceMemoryBase &&Other) {
+  GlobalDeviceMemoryBase &operator=(GlobalDeviceMemoryBase &&Other) noexcept {
     TheDevice = Other.TheDevice;
     Handle = Other.Handle;
     ByteCount = Other.ByteCount;
     Other.TheDevice = nullptr;
     Other.Handle = nullptr;
     Other.ByteCount = 0;
     return *this;
   }

 /// For example, GlobalDeviceMemory<int> is a simple wrapper around
 /// GlobalDeviceMemoryBase that represents a buffer of integers stored in global
 /// device memory.
 template <typename ElemT>
 class GlobalDeviceMemory : public GlobalDeviceMemoryBase {
 public:
   using ElementTy = ElemT;
 
-  GlobalDeviceMemory(GlobalDeviceMemory &&Other) = default;
-  GlobalDeviceMemory &operator=(GlobalDeviceMemory &&Other) = default;
+  GlobalDeviceMemory(GlobalDeviceMemory &&) noexcept;
+  GlobalDeviceMemory &operator=(GlobalDeviceMemory &&) noexcept;
 
   /// Returns the number of elements of type ElemT that constitute this
   /// allocation.
   size_t getElementCount() const { return ByteCount / sizeof(ElemT); }
 
   /// Returns the number of bytes that can fit in this memory buffer.
   size_t getByteCount() const { return ByteCount; }
 
   /// Converts this memory object into a slice.
   GlobalDeviceMemorySlice<ElemT> asSlice() const {
     return GlobalDeviceMemorySlice<ElemT>(*this);
   }
 
 private:
   GlobalDeviceMemory(const GlobalDeviceMemory &) = delete;
   GlobalDeviceMemory &operator=(const GlobalDeviceMemory &) = delete;
 
   // Only a Device can create a GlobalDeviceMemory instance.
   friend Device;
   GlobalDeviceMemory(Device *D, const void *Handle, size_t ElementCount)
       : GlobalDeviceMemoryBase(D, Handle, ElementCount * sizeof(ElemT)) {}
 };
 
+template <typename ElemT>
+GlobalDeviceMemory<ElemT>::GlobalDeviceMemory(
+    GlobalDeviceMemory<ElemT> &&) noexcept = default;
+
+template <typename ElemT>
+GlobalDeviceMemory<ElemT> &GlobalDeviceMemory<ElemT>::
+operator=(GlobalDeviceMemory<ElemT> &&) noexcept = default;
+
 /// A class to represent the size of a dynamic shared memory buffer of elements
 /// of type T on a device.
 ///
 /// Shared memory buffers exist only on the device and cannot be manipulated
 /// from the host, so instances of this class do not have an opaque handle, only
 /// a size.
 ///
 /// This type of memory is called "local" memory in OpenCL and "shared" memory

streamexecutor/include/streamexecutor/Error.h

 namespace streamexecutor {
 
 using llvm::consumeError;
 using llvm::Error;
 using llvm::Expected;
 using llvm::Twine;
 
 /// Makes an Error object from an error message.
-Error make_error(Twine Message);
+Error make_error(const Twine &Message);
 
 /// Consumes the input error and returns its error message.
 ///
 /// Assumes the input was created by the make_error function above.
 std::string consumeAndGetMessage(Error &&E);
 
 /// Extracts the T value from an Expected<T> or prints an error message to
 /// stderr and exits the program with code EXIT_FAILURE if the Expected<T> is an

streamexecutor/include/streamexecutor/HostMemory.h

RegisteredHostMemory(Device *TheDevice, ElemT *Pointer, size_t ElementCount)
     assert(TheDevice != nullptr && "cannot construct a "
                                    "RegisteredHostMemoryBase with a null "
                                    "platform device");
   }
 
   RegisteredHostMemory(const RegisteredHostMemory &) = delete;
   RegisteredHostMemory &operator=(const RegisteredHostMemory &) = delete;
 
-  RegisteredHostMemory(RegisteredHostMemory &&Other)
+  RegisteredHostMemory(RegisteredHostMemory &&Other) noexcept
       : TheDevice(Other.TheDevice), Pointer(Other.Pointer),
         ElementCount(Other.ElementCount) {
     Other.TheDevice = nullptr;
     Other.Pointer = nullptr;
   }
 
-  RegisteredHostMemory &operator=(RegisteredHostMemory &&Other) {
+  RegisteredHostMemory &operator=(RegisteredHostMemory &&Other) noexcept {
     TheDevice = Other.TheDevice;
     Pointer = Other.Pointer;
     ElementCount = Other.ElementCount;
     Other.TheDevice = nullptr;
     Other.Pointer = nullptr;
   }
 
   ~RegisteredHostMemory() {

streamexecutor/include/streamexecutor/Kernel.h

 class KernelBase {
 public:
   KernelBase(PlatformDevice *D, const void *PlatformKernelHandle,
              llvm::StringRef Name);
 
   KernelBase(const KernelBase &Other) = delete;
   KernelBase &operator=(const KernelBase &Other) = delete;
 
-  KernelBase(KernelBase &&Other);
-  KernelBase &operator=(KernelBase &&Other);
+  KernelBase(KernelBase &&Other) noexcept;
+  KernelBase &operator=(KernelBase &&Other) noexcept;
 
   ~KernelBase();
 
   const void *getPlatformHandle() const { return PlatformKernelHandle; }
   const std::string &getName() const { return Name; }
   const std::string &getDemangledName() const { return DemangledName; }
 
 private:

 /// The template parameters are the types of the parameters to the kernel
 /// function.
 template <typename... ParameterTs> class Kernel : public KernelBase {
 public:
   Kernel(PlatformDevice *D, const void *PlatformKernelHandle,
          llvm::StringRef Name)
       : KernelBase(D, PlatformKernelHandle, Name) {}
 
-  Kernel(Kernel &&Other) = default;
-  Kernel &operator=(Kernel &&Other) = default;
+  Kernel(Kernel &&Other) noexcept;
+  Kernel &operator=(Kernel &&Other) noexcept;
 };
 
+template <typename... ParameterTs>
+Kernel<ParameterTs...>::Kernel(Kernel<ParameterTs...> &&) noexcept = default;
+
+template <typename... ParameterTs>
+Kernel<ParameterTs...> &Kernel<ParameterTs...>::
+operator=(Kernel<ParameterTs...> &&) noexcept = default;
+
 } // namespace streamexecutor
 
 #endif // STREAMEXECUTOR_KERNEL_H

streamexecutor/include/streamexecutor/KernelSpec.h

 /// abort.
 ///
 /// This interface is prone to errors, so it is better to leave
 /// MultiKernelLoaderSpec creation and initialization to the compiler rather
 /// than doing it by hand.
 class MultiKernelLoaderSpec {
 public:
   std::string getKernelName() const {
-    if (TheKernelName) {
+    if (TheKernelName)
       return *TheKernelName;
-    }
     return "";
   }
 
   // Convenience getters for testing whether these platform variants have
   // kernel loader specifications available.
 
   bool hasCUDAPTXInMemory() const { return TheCUDAPTXInMemorySpec != nullptr; }
   bool hasCUDAFatbinInMemory() const {

streamexecutor/include/streamexecutor/Stream.h

 /// of a stream once it is in an error state.
 class Stream {
 public:
   Stream(PlatformDevice *D, const void *PlatformStreamHandle);
 
   Stream(const Stream &Other) = delete;
   Stream &operator=(const Stream &Other) = delete;
 
-  Stream(Stream &&Other);
-  Stream &operator=(Stream &&Other);
+  Stream(Stream &&Other) noexcept;
+  Stream &operator=(Stream &&Other) noexcept;
 
   ~Stream();
 
   /// Returns whether any error has occurred while entraining work on this
   /// stream.
   bool isOK() const {
     llvm::sys::ScopedReader ReaderLock(*ErrorMessageMutex);
     return !ErrorMessage;
if (E) {
       if (!ErrorMessage)
         ErrorMessage = consumeAndGetMessage(std::move(E));
     }
   }
 
   /// Sets the error state from an error message.
   ///
   /// Does not overwrite the error if it is already set.
-  void setError(llvm::Twine Message) {
+  void setError(const llvm::Twine &Message) {
     llvm::sys::ScopedWriter WriterLock(*ErrorMessageMutex);
     if (!ErrorMessage)
       ErrorMessage = Message.str();
   }
 
   /// The PlatformDevice that supports the operations of this stream.
   PlatformDevice *PDevice;
 

streamexecutor/include/streamexecutor/unittests/CoreTests/SimpleHostPlatformDevice.h

 //===-- SimpleHostPlatformDevice.h - Host device for testing ----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// The SimpleHostPlatformDevice class is a streamexecutor::PlatformDevice that
 /// is really just the host processor and memory. It is useful for testing
 /// because no extra device platform is required.
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef STREAMEXECUTOR_LIB_UNITTESTS_SIMPLEHOSTPLATFORMDEVICE_H
-#define STREAMEXECUTOR_LIB_UNITTESTS_SIMPLEHOSTPLATFORMDEVICE_H
+#ifndef STREAMEXECUTOR_UNITTESTS_CORETESTS_SIMPLEHOSTPLATFORMDEVICE_H
+#define STREAMEXECUTOR_UNITTESTS_CORETESTS_SIMPLEHOSTPLATFORMDEVICE_H
 
 #include <cstdlib>
 #include <cstring>
 
 #include "streamexecutor/PlatformDevice.h"
 
 namespace streamexecutor {
 namespace test {
static T getDeviceValue(const streamexecutor::GlobalDeviceMemory<T> &Memory,
                           size_t Index) {
     return static_cast<const T *>(Memory.getHandle())[Index];
   }
 };
 
 } // namespace test
 } // namespace streamexecutor
 
-#endif // STREAMEXECUTOR_LIB_UNITTESTS_SIMPLEHOSTPLATFORMDEVICE_H
+#endif // STREAMEXECUTOR_UNITTESTS_CORETESTS_SIMPLEHOSTPLATFORMDEVICE_H

streamexecutor/lib/Device.cpp

 namespace streamexecutor {
 
 Device::Device(PlatformDevice *PDevice) : PDevice(PDevice) {}
 
 Device::~Device() = default;
 
 Expected<Stream> Device::createStream() {
   Expected<const void *> MaybePlatformStream = PDevice->createStream();
-  if (!MaybePlatformStream) {
+  if (!MaybePlatformStream)
     return MaybePlatformStream.takeError();
-  }
   return Stream(PDevice, *MaybePlatformStream);
 }
 
 } // namespace streamexecutor

streamexecutor/lib/DeviceMemory.cpp

 
 #include "streamexecutor/DeviceMemory.h"
 
 #include "streamexecutor/Device.h"
 
 namespace streamexecutor {
 
 GlobalDeviceMemoryBase::~GlobalDeviceMemoryBase() {
-  if (Handle) {
+  if (Handle)
     // TODO(jhen): How to handle errors here.
     consumeError(TheDevice->freeDeviceMemory(*this));
-  }
-}
 
 } // namespace streamexecutor

streamexecutor/lib/Error.cpp

 };
 
 char StreamExecutorError::ID = 0;
 
 } // namespace
 
 namespace streamexecutor {
 
-Error make_error(Twine Message) {
+Error make_error(const Twine &Message) {
   return llvm::make_error<StreamExecutorError>(Message.str());
 }
 
 std::string consumeAndGetMessage(Error &&E) {
-  if (!E) {
+  if (!E)
     return "success";
-  }
   std::string Message;
   llvm::handleAllErrors(std::move(E),
                         [&Message](const StreamExecutorError &SEE) {
                           Message = SEE.getErrorMessage();
                         });
   return Message;
 }
 

streamexecutor/lib/HostMemory.cpp

 #include "streamexecutor/HostMemory.h"
 #include "streamexecutor/Device.h"
 
 namespace streamexecutor {
 namespace internal {
 
 void destroyRegisteredHostMemoryInternals(Device *TheDevice, void *Pointer) {
   // TODO(jhen): How to handle errors here?
-  if (Pointer) {
+  if (Pointer)
     consumeError(TheDevice->unregisterHostMemory(Pointer));
-  }
-}
 
 } // namespace internal
 } // namespace streamexecutor

streamexecutor/lib/Kernel.cpp

: PDevice(D), PlatformKernelHandle(PlatformKernelHandle), Name(Name),
       DemangledName(
           llvm::symbolize::LLVMSymbolizer::DemangleName(Name, nullptr)) {
   assert(D != nullptr &&
          "cannot construct a kernel object with a null platform device");
   assert(PlatformKernelHandle != nullptr &&
          "cannot construct a kernel object with a null platform kernel handle");
 }
 
-KernelBase::KernelBase(KernelBase &&Other)
+KernelBase::KernelBase(KernelBase &&Other) noexcept
     : PDevice(Other.PDevice), PlatformKernelHandle(Other.PlatformKernelHandle),
       Name(std::move(Other.Name)),
       DemangledName(std::move(Other.DemangledName)) {
   Other.PDevice = nullptr;
   Other.PlatformKernelHandle = nullptr;
 }
 
-KernelBase &KernelBase::operator=(KernelBase &&Other) {
+KernelBase &KernelBase::operator=(KernelBase &&Other) noexcept {
   PDevice = Other.PDevice;
   PlatformKernelHandle = Other.PlatformKernelHandle;
   Name = std::move(Other.Name);
   DemangledName = std::move(Other.DemangledName);
   Other.PDevice = nullptr;
   Other.PlatformKernelHandle = nullptr;
   return *this;
 }
 
 KernelBase::~KernelBase() {
   if (PlatformKernelHandle)
     // TODO(jhen): Handle the error here.
     consumeError(PDevice->destroyKernel(PlatformKernelHandle));
 }
 
 } // namespace streamexecutor

streamexecutor/lib/KernelSpec.cpp

 
 KernelLoaderSpec::KernelLoaderSpec(llvm::StringRef KernelName)
     : KernelName(KernelName) {}
 
 CUDAPTXInMemorySpec::CUDAPTXInMemorySpec(
     llvm::StringRef KernelName,
     const llvm::ArrayRef<CUDAPTXInMemorySpec::PTXSpec> SpecList)
     : KernelLoaderSpec(KernelName) {
-  for (const auto &Spec : SpecList) {
+  for (const auto &Spec : SpecList)
     PTXByComputeCapability.emplace(Spec.TheComputeCapability, Spec.PTXCode);
-  }
-}
 
 const char *CUDAPTXInMemorySpec::getCode(int ComputeCapabilityMajor,
                                          int ComputeCapabilityMinor) const {
   auto PTXIter =
       PTXByComputeCapability.find(CUDAPTXInMemorySpec::ComputeCapability{
           ComputeCapabilityMajor, ComputeCapabilityMinor});
-  if (PTXIter == PTXByComputeCapability.end()) {
+  if (PTXIter == PTXByComputeCapability.end())
     return nullptr;
-  }
   return PTXIter->second;
 }
 
 CUDAFatbinInMemorySpec::CUDAFatbinInMemorySpec(llvm::StringRef KernelName,
                                                const void *Bytes)
     : KernelLoaderSpec(KernelName), Bytes(Bytes) {}
 
 OpenCLTextInMemorySpec::OpenCLTextInMemorySpec(llvm::StringRef KernelName,
                                                const char *Text)
     : KernelLoaderSpec(KernelName), Text(Text) {}
 
 void MultiKernelLoaderSpec::setKernelName(llvm::StringRef KernelName) {
-  if (TheKernelName) {
+  if (TheKernelName)
     assert(KernelName.equals(*TheKernelName) &&
            "different kernel names in one MultiKernelLoaderSpec");
-  } else {
+  else
     TheKernelName = llvm::make_unique<std::string>(KernelName);
-  }
-}
 
 MultiKernelLoaderSpec &MultiKernelLoaderSpec::addCUDAPTXInMemory(
     llvm::StringRef KernelName,
     llvm::ArrayRef<CUDAPTXInMemorySpec::PTXSpec> SpecList) {
   assert((TheCUDAPTXInMemorySpec == nullptr) &&
          "illegal loader spec overwrite");
   setKernelName(KernelName);
   TheCUDAPTXInMemorySpec =

streamexecutor/lib/Stream.cpp

Stream::Stream(PlatformDevice *D, const void *PlatformStreamHandle)
     : PDevice(D), PlatformStreamHandle(PlatformStreamHandle),
       ErrorMessageMutex(llvm::make_unique<llvm::sys::RWMutex>()) {
   assert(D != nullptr &&
          "cannot construct a stream object with a null platform device");
   assert(PlatformStreamHandle != nullptr &&
          "cannot construct a stream object with a null platform stream handle");
 }
 
-Stream::Stream(Stream &&Other)
+Stream::Stream(Stream &&Other) noexcept
     : PDevice(Other.PDevice), PlatformStreamHandle(Other.PlatformStreamHandle),
       ErrorMessageMutex(std::move(Other.ErrorMessageMutex)),
       ErrorMessage(std::move(Other.ErrorMessage)) {
   Other.PDevice = nullptr;
   Other.PlatformStreamHandle = nullptr;
 }
 
-Stream &Stream::operator=(Stream &&Other) {
+Stream &Stream::operator=(Stream &&Other) noexcept {
   PDevice = Other.PDevice;
   PlatformStreamHandle = Other.PlatformStreamHandle;
   ErrorMessageMutex = std::move(Other.ErrorMessageMutex);
   ErrorMessage = std::move(Other.ErrorMessage);
   Other.PDevice = nullptr;
   Other.PlatformStreamHandle = nullptr;
   return *this;
 }
 
 Stream::~Stream() {
   if (PlatformStreamHandle)
     // TODO(jhen): Handle error condition here.
     consumeError(PDevice->destroyStream(PlatformStreamHandle));
 }
 
 } // namespace streamexecutor

streamexecutor/unittests/CoreTests/DeviceTest.cpp

 /// \file
 /// This file contains the unit tests for Device code.
 ///
 //===----------------------------------------------------------------------===//
 
 #include <cstdlib>
 #include <cstring>
 
-#include "SimpleHostPlatformDevice.h"
 #include "streamexecutor/Device.h"
 #include "streamexecutor/PlatformDevice.h"
+#include "streamexecutor/unittests/CoreTests/SimpleHostPlatformDevice.h"
 
 #include "gtest/gtest.h"
 
 namespace {
 
 namespace se = ::streamexecutor;
 
 const auto &getDeviceValue =
TEST_F(DeviceTest, RegisterAndUnregisterHostMemory) {
   EXPECT_TRUE(static_cast<bool>(MaybeMemory));
 }
 
 // D2H tests
 
 TEST_F(DeviceTest, SyncCopyD2HToMutableArrayRefByCount) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2H(DeviceA5, MutableArrayRef<int>(Host5), 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2H(DeviceB5, MutableArrayRef<int>(Host5), 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(HostB5[I], Host5[I]);
-  }
 
   EXPECT_ERROR(
       Device.synchronousCopyD2H(DeviceA7, MutableArrayRef<int>(Host5), 7));
 
   EXPECT_ERROR(
       Device.synchronousCopyD2H(DeviceA5, MutableArrayRef<int>(Host7), 7));
 
   EXPECT_ERROR(
       Device.synchronousCopyD2H(DeviceA5, MutableArrayRef<int>(Host5), 7));
 }
 
 TEST_F(DeviceTest, SyncCopyD2HToMutableArrayRef) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2H(DeviceA5, MutableArrayRef<int>(Host5)));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   EXPECT_ERROR(
       Device.synchronousCopyD2H(DeviceA7, MutableArrayRef<int>(Host5)));
 
   EXPECT_ERROR(
       Device.synchronousCopyD2H(DeviceA5, MutableArrayRef<int>(Host7)));
 }
 
 TEST_F(DeviceTest, SyncCopyD2HToPointer) {
   EXPECT_NO_ERROR(Device.synchronousCopyD2H(DeviceA5, Host5, 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2H(DeviceA5, Host7, 7));
 }
 
 TEST_F(DeviceTest, SyncCopyD2HSliceToMutableArrayRefByCount) {
   EXPECT_NO_ERROR(Device.synchronousCopyD2H(
       DeviceA5.asSlice().slice(1), MutableArrayRef<int>(Host5 + 1, 4), 4));
-  for (int I = 1; I < 5; ++I) {
+  for (int I = 1; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   EXPECT_NO_ERROR(Device.synchronousCopyD2H(DeviceB5.asSlice().drop_back(1),
                                             MutableArrayRef<int>(Host5), 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(HostB5[I], Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2H(DeviceA7.asSlice(),
                                          MutableArrayRef<int>(Host5), 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2H(DeviceA5.asSlice(),
                                          MutableArrayRef<int>(Host7), 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2H(DeviceA5.asSlice(),
                                          MutableArrayRef<int>(Host5), 7));
 }
 
 TEST_F(DeviceTest, SyncCopyD2HSliceToMutableArrayRef) {
   EXPECT_NO_ERROR(Device.synchronousCopyD2H(DeviceA7.asSlice().slice(1, 5),
                                             MutableArrayRef<int>(Host5)));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(HostA7[I + 1], Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2H(DeviceA7.asSlice().drop_back(1),
                                          MutableArrayRef<int>(Host5)));
 
   EXPECT_ERROR(Device.synchronousCopyD2H(DeviceA5.asSlice(),
                                          MutableArrayRef<int>(Host7)));
 }
 
 TEST_F(DeviceTest, SyncCopyD2HSliceToPointer) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2H(DeviceA5.asSlice().slice(1), Host5 + 1, 4));
-  for (int I = 1; I < 5; ++I) {
+  for (int I = 1; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2H(DeviceA5.asSlice(), Host7, 7));
 }
 
 // H2D tests
 
 TEST_F(DeviceTest, SyncCopyH2DToArrayRefByCount) {
   EXPECT_NO_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA5, 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   EXPECT_NO_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceB5, 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceB5, I), Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host7), DeviceA5, 7));
 
   EXPECT_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA7, 7));
 
   EXPECT_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA5, 7));
 }
 
 TEST_F(DeviceTest, SyncCopyH2DToArrayRef) {
   EXPECT_NO_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA7));
 
   EXPECT_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host7), DeviceA5));
 }
 
 TEST_F(DeviceTest, SyncCopyH2DToPointer) {
   EXPECT_NO_ERROR(Device.synchronousCopyH2D(Host5, DeviceA5, 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyH2D(Host7, DeviceA5, 7));
 }
 
 TEST_F(DeviceTest, SyncCopyH2DSliceToArrayRefByCount) {
   EXPECT_NO_ERROR(Device.synchronousCopyH2D(ArrayRef<int>(Host5 + 1, 4),
                                             DeviceA5.asSlice().slice(1), 4));
-  for (int I = 1; I < 5; ++I) {
+  for (int I = 1; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   EXPECT_NO_ERROR(Device.synchronousCopyH2D(
       ArrayRef<int>(Host5), DeviceB5.asSlice().drop_back(1), 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceB5, I), Host5[I]);
-  }
 
   EXPECT_ERROR(
       Device.synchronousCopyH2D(ArrayRef<int>(Host7), DeviceA5.asSlice(), 7));
 
   EXPECT_ERROR(
       Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA7.asSlice(), 7));
 
   EXPECT_ERROR(
       Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA5.asSlice(), 7));
 }
 
 TEST_F(DeviceTest, SyncCopyH2DSliceToArrayRef) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA5.asSlice()));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   EXPECT_ERROR(
       Device.synchronousCopyH2D(ArrayRef<int>(Host5), DeviceA7.asSlice()));
 
   EXPECT_ERROR(
       Device.synchronousCopyH2D(ArrayRef<int>(Host7), DeviceA5.asSlice()));
 }
 
 TEST_F(DeviceTest, SyncCopyH2DSliceToPointer) {
   EXPECT_NO_ERROR(Device.synchronousCopyH2D(Host5, DeviceA5.asSlice(), 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   EXPECT_ERROR(Device.synchronousCopyH2D(Host7, DeviceA5.asSlice(), 7));
 }
 
 // D2D tests
 
 TEST_F(DeviceTest, SyncCopyD2DByCount) {
   EXPECT_NO_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB5, 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   EXPECT_NO_ERROR(Device.synchronousCopyD2D(DeviceA7, DeviceB7, 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB5, 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA7, DeviceB5, 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB7, 7));
 }
 
 TEST_F(DeviceTest, SyncCopyD2D) {
   EXPECT_NO_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA7, DeviceB5));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB7));
 }
 
 TEST_F(DeviceTest, SyncCopySliceD2DByCount) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA5.asSlice().slice(1), DeviceB5, 4));
-  for (int I = 0; I < 4; ++I) {
+  for (int I = 0; I < 4; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I + 1), getDeviceValue(DeviceB5, I));
-  }
 
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA7.asSlice().drop_back(1), DeviceB7, 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5.asSlice(), DeviceB5, 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA7.asSlice(), DeviceB5, 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5.asSlice(), DeviceB7, 7));
 }
 
 TEST_F(DeviceTest, SyncCopySliceD2D) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA7.asSlice().drop_back(2), DeviceB5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB5, I));
-  }
 
   EXPECT_ERROR(
       Device.synchronousCopyD2D(DeviceA7.asSlice().slice(1), DeviceB5));
 
   EXPECT_ERROR(
       Device.synchronousCopyD2D(DeviceA5.asSlice().drop_back(1), DeviceB7));
 }
 
 TEST_F(DeviceTest, SyncCopyD2DSliceByCount) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA5, DeviceB7.asSlice().slice(2), 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB7, I + 2));
-  }
 
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA7, DeviceB7.asSlice().drop_back(3), 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB5.asSlice(), 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA7, DeviceB5.asSlice(), 7));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB7.asSlice(), 7));
 }
 
 TEST_F(DeviceTest, SyncCopyD2DSlice) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA5, DeviceB7.asSlice().drop_back(2)));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB7, I));
-  }
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA7, DeviceB5.asSlice()));
 
   EXPECT_ERROR(Device.synchronousCopyD2D(DeviceA5, DeviceB7.asSlice()));
 }
 
 TEST_F(DeviceTest, SyncCopySliceD2DSliceByCount) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA5.asSlice(), DeviceB5.asSlice(), 5));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA7.asSlice(), DeviceB7.asSlice(), 2));
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   EXPECT_ERROR(
       Device.synchronousCopyD2D(DeviceA5.asSlice(), DeviceB5.asSlice(), 7));
 
   EXPECT_ERROR(
       Device.synchronousCopyD2D(DeviceA7.asSlice(), DeviceB5.asSlice(), 7));
 
   EXPECT_ERROR(
       Device.synchronousCopyD2D(DeviceA5.asSlice(), DeviceB7.asSlice(), 7));
 }
 
 TEST_F(DeviceTest, SyncCopySliceD2DSlice) {
   EXPECT_NO_ERROR(
       Device.synchronousCopyD2D(DeviceA5.asSlice(), DeviceB5.asSlice()));
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   EXPECT_ERROR(
       Device.synchronousCopyD2D(DeviceA7.asSlice(), DeviceB5.asSlice()));
 
   EXPECT_ERROR(
       Device.synchronousCopyD2D(DeviceA5.asSlice(), DeviceB7.asSlice()));
 }
 
 } // namespace

streamexecutor/unittests/CoreTests/PackedKernelArgumentArrayTest.cpp

 //===-- PackedKernelArgumentArrayTest.cpp - tests for kernel arg packing --===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// Unit tests for kernel argument packing.
 ///
 //===----------------------------------------------------------------------===//
 
-#include "SimpleHostPlatformDevice.h"
 #include "streamexecutor/Device.h"
 #include "streamexecutor/DeviceMemory.h"
 #include "streamexecutor/PackedKernelArgumentArray.h"
 #include "streamexecutor/PlatformDevice.h"
+#include "streamexecutor/unittests/CoreTests/SimpleHostPlatformDevice.h"
 
 #include "llvm/ADT/Twine.h"
 
 #include "gtest/gtest.h"
 
 namespace {
 
 namespace se = ::streamexecutor;

streamexecutor/unittests/CoreTests/StreamTest.cpp

 //===-- StreamTest.cpp - Tests for Stream ---------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file contains the unit tests for Stream code.
 ///
 //===----------------------------------------------------------------------===//
 
 #include <cstring>
 
-#include "SimpleHostPlatformDevice.h"
 #include "streamexecutor/Device.h"
 #include "streamexecutor/Kernel.h"
 #include "streamexecutor/KernelSpec.h"
 #include "streamexecutor/PlatformDevice.h"
 #include "streamexecutor/Stream.h"
+#include "streamexecutor/unittests/CoreTests/SimpleHostPlatformDevice.h"
 
 #include "gtest/gtest.h"
 
 namespace {
 
 namespace se = ::streamexecutor;
 
 const auto &getDeviceValue =
protected:
 
   // Device memory.
   se::GlobalDeviceMemory<int> DeviceA5;
   se::GlobalDeviceMemory<int> DeviceB5;
   se::GlobalDeviceMemory<int> DeviceA7;
   se::GlobalDeviceMemory<int> DeviceB7;
 };
 
-using llvm::ArrayRef;
-using llvm::MutableArrayRef;
-
 // D2H tests
 
 TEST_F(StreamTest, CopyD2HToRegisteredRefByCount) {
   Stream.thenCopyD2H(DeviceA5, RegisteredHost5, 5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   Stream.thenCopyD2H(DeviceB5, RegisteredHost5, 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(HostB5[I], Host5[I]);
-  }
 
   Stream.thenCopyD2H(DeviceA7, RegisteredHost5, 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyD2HToRegistered) {
   Stream.thenCopyD2H(DeviceA5, RegisteredHost5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   Stream.thenCopyD2H(DeviceA5, RegisteredHost7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyD2HSliceToRegiseredSliceByCount) {
   Stream.thenCopyD2H(DeviceA5.asSlice().slice(1),
                      RegisteredHost5.asSlice().slice(1, 4), 4);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 1; I < 5; ++I) {
+  for (int I = 1; I < 5; ++I)
     EXPECT_EQ(HostA5[I], Host5[I]);
-  }
 
   Stream.thenCopyD2H(DeviceB5.asSlice().drop_back(1), RegisteredHost5, 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(HostB5[I], Host5[I]);
-  }
 
   Stream.thenCopyD2H(DeviceA5.asSlice(), RegisteredHost7, 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyD2HSliceToRegistered) {
   Stream.thenCopyD2H(DeviceA7.asSlice().slice(1, 5), RegisteredHost5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(HostA7[I + 1], Host5[I]);
-  }
 
   Stream.thenCopyD2H(DeviceA5.asSlice(), RegisteredHost7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 // H2D tests
 
 TEST_F(StreamTest, CopyH2DFromRegisterdByCount) {
   Stream.thenCopyH2D(RegisteredHost5, DeviceA5, 5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   Stream.thenCopyH2D(RegisteredHost5, DeviceB5, 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceB5, I), Host5[I]);
-  }
 
   Stream.thenCopyH2D(RegisteredHost7, DeviceA5, 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyH2DFromRegistered) {
   Stream.thenCopyH2D(RegisteredHost5, DeviceA5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   Stream.thenCopyH2D(RegisteredHost7, DeviceA5);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyH2DFromRegisteredSliceToSlice) {
   Stream.thenCopyH2D(RegisteredHost5.asSlice().slice(1, 4),
                      DeviceA5.asSlice().slice(1), 4);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 1; I < 5; ++I) {
+  for (int I = 1; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   Stream.thenCopyH2D(RegisteredHost5, DeviceB5.asSlice().drop_back(1), 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceB5, I), Host5[I]);
-  }
 
   Stream.thenCopyH2D(RegisteredHost5, DeviceA5.asSlice(), 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyH2DRegisteredToSlice) {
   Stream.thenCopyH2D(RegisteredHost5, DeviceA5.asSlice());
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), Host5[I]);
-  }
 
   Stream.thenCopyH2D(RegisteredHost7, DeviceA5.asSlice());
   EXPECT_FALSE(Stream.isOK());
 }
 
 // D2D tests
 
 TEST_F(StreamTest, CopyD2DByCount) {
   Stream.thenCopyD2D(DeviceA5, DeviceB5, 5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   Stream.thenCopyD2D(DeviceA7, DeviceB7, 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   Stream.thenCopyD2D(DeviceA7, DeviceB5, 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyD2D) {
   Stream.thenCopyD2D(DeviceA5, DeviceB5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   Stream.thenCopyD2D(DeviceA7, DeviceB5);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopySliceD2DByCount) {
   Stream.thenCopyD2D(DeviceA5.asSlice().slice(1), DeviceB5, 4);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 4; ++I) {
+  for (int I = 0; I < 4; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I + 1), getDeviceValue(DeviceB5, I));
-  }
 
   Stream.thenCopyD2D(DeviceA7.asSlice().drop_back(1), DeviceB7, 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   Stream.thenCopyD2D(DeviceA5.asSlice(), DeviceB5, 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopySliceD2D) {
   Stream.thenCopyD2D(DeviceA7.asSlice().drop_back(2), DeviceB5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB5, I));
-  }
 
   Stream.thenCopyD2D(DeviceA5.asSlice().drop_back(1), DeviceB7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyD2DSliceByCount) {
   Stream.thenCopyD2D(DeviceA5, DeviceB7.asSlice().slice(2), 5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB7, I + 2));
-  }
 
   Stream.thenCopyD2D(DeviceA7, DeviceB7.asSlice().drop_back(3), 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   Stream.thenCopyD2D(DeviceA5, DeviceB7.asSlice(), 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopyD2DSlice) {
   Stream.thenCopyD2D(DeviceA5, DeviceB7.asSlice().drop_back(2));
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB7, I));
-  }
 
   Stream.thenCopyD2D(DeviceA5, DeviceB7.asSlice());
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopySliceD2DSliceByCount) {
   Stream.thenCopyD2D(DeviceA5.asSlice(), DeviceB5.asSlice(), 5);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   Stream.thenCopyD2D(DeviceA7.asSlice(), DeviceB7.asSlice(), 2);
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 2; ++I) {
+  for (int I = 0; I < 2; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA7, I), getDeviceValue(DeviceB7, I));
-  }
 
   Stream.thenCopyD2D(DeviceA7.asSlice(), DeviceB5.asSlice(), 7);
   EXPECT_FALSE(Stream.isOK());
 }
 
 TEST_F(StreamTest, CopySliceD2DSlice) {
   Stream.thenCopyD2D(DeviceA5.asSlice(), DeviceB5.asSlice());
   EXPECT_TRUE(Stream.isOK());
-  for (int I = 0; I < 5; ++I) {
+  for (int I = 0; I < 5; ++I)
     EXPECT_EQ(getDeviceValue(DeviceA5, I), getDeviceValue(DeviceB5, I));
-  }
 
   Stream.thenCopyD2D(DeviceA5.asSlice(), DeviceB7.asSlice());
   EXPECT_FALSE(Stream.isOK());
 }
 
 } // namespace