Address review comments

Author: jzc

llvm/include/llvm/Support/PropertySetIO.h

@@ -211,6 +211,9 @@ class PropertySetRegistry {
   static constexpr char SYCL_HOST_PIPES[] = "SYCL/host pipes";
   static constexpr char SYCL_VIRTUAL_FUNCTIONS[] = "SYCL/virtual functions";
 
+  static constexpr char PROPERTY_REQD_WORK_GROUP_SIZE[] =
+      "reqd_work_group_size_uint64_t";
+
   /// Function for bulk addition of an entire property set in the given
   /// \p Category .
   template <typename MapTy> void add(StringRef Category, const MapTy &Props) {
@@ -235,10 +238,7 @@ class PropertySetRegistry {
     if (PropertySetIt == PropSetMap.end())
       return;
     auto &PropertySet = PropertySetIt->second;
-    auto PropIt = PropertySet.find(PropName);
-    if (PropIt == PropertySet.end())
-      return;
-    PropertySet.erase(PropIt);
+    PropertySet.erase(PropertySet.find(PropName));
   }
 
   /// Parses from the given \p Buf a property set registry.

llvm/lib/SYCLLowerIR/SYCLDeviceRequirements.cpp

@@ -142,7 +142,8 @@ std::map<StringRef, util::PropertyValue> SYCLDeviceRequirements::asMap() const {
   // reqd_work_group_size_uint64_t attribute. At the next ABI-breaking
   // window, this can be changed back to reqd_work_group_size.
   if (ReqdWorkGroupSize.has_value())
-    Requirements["reqd_work_group_size_uint64_t"] = *ReqdWorkGroupSize;
+    Requirements[util::PropertySetRegistry::PROPERTY_REQD_WORK_GROUP_SIZE] =
+        *ReqdWorkGroupSize;
 
   if (JointMatrix.has_value())
     Requirements["joint_matrix"] = *JointMatrix;

llvm/tools/sycl-post-link/sycl-post-link.cpp

@@ -313,11 +313,11 @@ std::string saveModuleProperties(module_split::ModuleDesc &MD,
   // When the split mode is none, the required work group size will be added
   // to the whole module, which will make the runtime unable to
   // launch the other kernels in the module that have different
-  // required work group sizes or no requried work group sizes. So we need to
+  // required work group sizes or no required work group sizes. So we need to
   // remove the required work group size metadata in this case.
   if (SplitMode == module_split::SPLIT_NONE)
     PropSet.remove(PropSetRegTy::SYCL_DEVICE_REQUIREMENTS,
-                   "reqd_work_group_size_uint64_t");
+                   PropSetRegTy::PROPERTY_REQD_WORK_GROUP_SIZE);
 
   std::string NewSuff = Suff.str();
   if (!Target.empty()) {