Clang-tidy the code and cleanup a few places.

Author: nadavrot

include/glow/Backends/Backend.h

@@ -1,5 +1,5 @@
-#ifndef GLOW_BASE_BACKEND_H
-#define GLOW_BASE_BACKEND_H
+#ifndef GLOW_BACKENDS_BACKEND_H
+#define GLOW_BACKENDS_BACKEND_H
 
 namespace glow {
 
@@ -19,7 +19,7 @@ enum class BackendKind {
 class Backend {
 public:
   /// Dtor.
-  virtual ~Backend() {}
+  virtual ~Backend() = default;
 
   /// Wipe out the state of the interpreter.
   virtual void clear() = 0;
@@ -44,8 +44,8 @@ class Backend {
 };
 
 /// Create a backend of kind \p kind, to run the module \p M.
-Backend *createBackend(BackendKind kind, Module *M);
+Backend *createBackend(BackendKind backendKind, Module *M);
 
 } // namespace glow
 
-#endif // GLOW_BASE_BACKEND_H
+#endif // GLOW_BACKENDS_BACKEND_H

include/glow/Backends/MemoryAllocator.h

@@ -1,6 +1,5 @@
-#ifndef GLOW_BASE_MEMORYALLOCATOR_H
-#define GLOW_BASE_MEMORYALLOCATOR_H
-
+#ifndef GLOW_BACKENDS_MEMORYALLOCATOR_H
+#define GLOW_BACKENDS_MEMORYALLOCATOR_H
 #include <cstddef>
 #include <cstdint>
 #include <list>
@@ -37,7 +36,7 @@ class MemoryAllocator {
   /// A reserved value to mark invalid allocation.
   static const size_t npos;
 
-  MemoryAllocator(size_t poolSize) : poolSize_(poolSize) {}
+  explicit MemoryAllocator(size_t poolSize) : poolSize_(poolSize) {}
 
   void reset() {
     maxMemoryAllocated_ = 0;
@@ -47,8 +46,9 @@ class MemoryAllocator {
   /// \returns True if the value \p idx is within the currently allocated range.
   bool contains(size_t idx) {
     for (auto &s : allocations_) {
-      if (s.contains(idx))
+      if (s.contains(idx)) {
         return true;
+      }
     }
     return false;
   }
@@ -67,4 +67,4 @@ class MemoryAllocator {
 
 } // namespace glow
 
-#endif // GLOW_BASE_MEMORYALLOCATOR_H
+#endif // GLOW_BACKENDS_MEMORYALLOCATOR_H

src/glow/Backends/OpenCL/OpenCL.cpp

@@ -36,7 +36,7 @@ static void dumpCompileLog(cl_device_id dev, cl_program prog) {
   clGetProgramBuildInfo(prog, dev, CL_PROGRAM_BUILD_LOG, 0, nullptr, &log_size);
 
   // Allocate memory for the log.
-  char *log = (char *)malloc(log_size);
+  auto *log = (char *)malloc(log_size);
 
   // Get the log.
   clGetProgramBuildInfo(prog, dev, CL_PROGRAM_BUILD_LOG, log_size, log,
@@ -53,7 +53,7 @@ OCLBackend::OCLBackend(Module *M) : M_(M), allocator_(0xFFFFFFFF) {
       clGetDeviceIDs(nullptr, CL_DEVICE_TYPE_DEFAULT, 1, &deviceId_, nullptr);
   GLOW_ASSERT(err == CL_SUCCESS && "clGetDeviceIDs Failed.");
 
-  context_ = clCreateContext(0, 1, &deviceId_, nullptr, nullptr, &err);
+  context_ = clCreateContext(nullptr, 1, &deviceId_, nullptr, nullptr, &err);
   GLOW_ASSERT(context_ && "clCreateContext Failed.");
 
   commands_ = clCreateCommandQueue(context_, deviceId_, 0, &err);
@@ -76,7 +76,7 @@ OCLBackend::~OCLBackend() {
   clReleaseContext(context_);
   if (deviceBuffer_) {
     clReleaseMemObject(deviceBuffer_);
-    deviceBuffer_ = 0;
+    deviceBuffer_ = nullptr;
   }
   clear();
 }
@@ -397,8 +397,9 @@ void OCLBackend::doForwardPass(bool isTrain) {
 
 void OCLBackend::copyWeightsToDevice() {
   for (auto it : tensors_) {
-    if (!externalTensors_.count(it.first))
+    if (!externalTensors_.count(it.first)) {
       continue;
+    }
     Tensor *T = externalTensors_[it.first];
     size_t sizeInBytes = T->getType().getSizeInBytes();
     // Issue a non-blocking command to copy the buffer to the device.
@@ -415,8 +416,9 @@ void OCLBackend::copyWeightsFromDevice() {
   clFinish(commands_);
 
   for (auto it : tensors_) {
-    if (!externalTensors_.count(it.first))
+    if (!externalTensors_.count(it.first)) {
       continue;
+    }
 
     Tensor *T = externalTensors_[it.first];
     size_t sizeInBytes = T->getType().getSizeInBytes();
@@ -470,7 +472,7 @@ void OCLBackend::init() {
   // Release the memory from the previous run.
   if (deviceBuffer_) {
     clReleaseMemObject(deviceBuffer_);
-    deviceBuffer_ = 0;
+    deviceBuffer_ = nullptr;
   }
 
   deviceBuffer_ = clCreateBuffer(context_, CL_MEM_READ_WRITE, requiredSpace,

src/glow/Graph/Graph.cpp

@@ -159,8 +159,9 @@ TransposeNode *Graph::createTranspose(llvm::StringRef name, Node *input,
 /// \returns true if \p T1 and T2 has the exact same type except for dimension
 /// \p dim.
 static bool sameSameShapeExceptDim(TypeRef T1, TypeRef T2, unsigned dim) {
-  if (T1->getElementType() != T2->getElementType())
+  if (T1->getElementType() != T2->getElementType()) {
     return false;
+  }
 
   auto D1 = T1->dims();
   auto D2 = T2->dims();
@@ -303,7 +304,7 @@ struct DottyPrinterPass : NodeVisitor {
     return std::find(nodeEdges.begin(), nodeEdges.end(), e) == nodeEdges.end();
   }
 
-  DottyPrinterPass(std::ostream &os) : os_(os) {}
+  explicit DottyPrinterPass(std::ostream &os) : os_(os) {}
 
   void pre(Node *parent, Node *N) override {
     nodeEdges.emplace_back(parent, N);