address comments

Author: AlexMaclean

llvm/lib/Target/NVPTX/NVPTXAliasAnalysis.cpp

@@ -132,11 +132,10 @@ MemoryEffects NVPTXAAResult::getMemoryEffects(const CallBase *Call,
         return MemoryEffects::unknown();
 
       // Memory clobbers prevent optimization.
-      if (!(Constraint.Type & InlineAsm::ConstraintPrefix::isClobber))
-        continue;
-      for (const std::string &Code : Constraint.Codes)
-        if (Code == "{memory}")
-          return MemoryEffects::unknown();
+      if ((Constraint.Type & InlineAsm::ConstraintPrefix::isClobber) &&
+          any_of(Constraint.Codes,
+                 [](const auto &Code) { return Code == "{memory}"; }))
+        return MemoryEffects::unknown();
     }
     return MemoryEffects::none();
   }

llvm/lib/Target/NVPTX/NVPTXTargetTransformInfo.cpp

@@ -496,16 +496,17 @@ NVPTXTTIImpl::getInstructionCost(const User *U,
       // be to return the number of asm instructions embedded in the asm
       // string.
       auto &AsmStr = IA->getAsmString();
-      SmallVector<StringRef, 4> AsmPieces;
-      SplitString(AsmStr, AsmPieces, ";\n");
-
-      const unsigned InstCount = count_if(AsmPieces, [](StringRef AsmInst) {
-        AsmInst = AsmInst.trim();
-        // This is pretty course but does a reasonably good job of identifying
-        // things that look like instructions, possibly with a predicate ("@").
-        return !AsmInst.empty() && (AsmInst[0] == '@' || isAlpha(AsmInst[0]) ||
-                                    AsmInst.find(".pragma") != StringRef::npos);
-      });
+      const unsigned InstCount =
+          count_if(split(AsmStr, ';'), [](StringRef AsmInst) {
+            // Trim off scopes denoted by '{' and '}' as these can be ignored
+            AsmInst = AsmInst.trim().ltrim("{} \t\n\v\f\r");
+            // This is pretty coarse but does a reasonably good job of
+            // identifying things that look like instructions, possibly with a
+            // predicate ("@").
+            return !AsmInst.empty() &&
+                   (AsmInst[0] == '@' || isAlpha(AsmInst[0]) ||
+                    AsmInst.find(".pragma") != StringRef::npos);
+          });
       return InstCount * TargetTransformInfo::TCC_Basic;
     }