update test, use stringmap

Author: Pierre-vh

clang/test/SemaOpenCL/builtins-amdgcn-error.cl

@@ -155,8 +155,8 @@ void test_ds_fmaxf(local float *out, float src, int a) {
 void test_fence() {
   __builtin_amdgcn_fence(__ATOMIC_SEQ_CST + 1, "workgroup"); // expected-warning {{memory order argument to atomic operation is invalid}}
   __builtin_amdgcn_fence(__ATOMIC_ACQUIRE - 1, "workgroup"); // expected-warning {{memory order argument to atomic operation is invalid}}
-  __builtin_amdgcn_fence(4); // expected-error {{too few arguments to function call, expected 2}}
-  __builtin_amdgcn_fence(4, 4, 4); // expected-error {{too many arguments to function call, expected 2}}
+  __builtin_amdgcn_fence(4); // expected-error {{too few arguments to function call, expected at least 2, have 1}}
+  __builtin_amdgcn_fence(4, 4, 4); // expected-error {{incompatible integer to pointer conversion passing 'int' to parameter of type 'const char *'}}
   __builtin_amdgcn_fence(3.14, ""); // expected-warning {{implicit conversion from 'double' to 'unsigned int' changes value from 3.14 to 3}}
   __builtin_amdgcn_fence(__ATOMIC_ACQUIRE, 5); // expected-error {{incompatible integer to pointer conversion passing 'int' to parameter of type 'const char *'}}
   const char ptr[] = "workgroup";

llvm/lib/Target/AMDGPU/SIMemoryLegalizer.cpp

@@ -680,7 +680,7 @@ class SIMemoryLegalizer final : public MachineFunctionPass {
   bool runOnMachineFunction(MachineFunction &MF) override;
 };
 
-static std::array<std::pair<StringLiteral, SIAtomicAddrSpace>, 3> ASNames = {{
+static const StringMap<SIAtomicAddrSpace> ASNames = {{
     {"global", SIAtomicAddrSpace::GLOBAL},
     {"local", SIAtomicAddrSpace::LDS},
     {"image", SIAtomicAddrSpace::SCRATCH},
@@ -715,11 +715,7 @@ static SIAtomicAddrSpace getFenceAddrSpaceMMRA(const MachineInstr &MI,
     if (Prefix != FenceASPrefix)
       continue;
 
-    auto It = find_if(ASNames, [Suffix = Suffix](auto &Pair) {
-      return Pair.first == Suffix;
-    });
-
-    if (It != ASNames.end())
+    if (auto It = ASNames.find(Suffix); It != ASNames.end())
       Result |= It->second;
     else
       diagnoseUnknownMMRAASName(MI, Suffix);