@@ -635,18 +635,18 @@ std::optional<TargetDetails> getAMDGPUTargetDetails(StringRef target) {
635635  return  llvm::StringSwitch<std::optional<TargetDetails>>(target.lower ())
636636      .Case (" mi355x"  , TargetDetails{cdna4Wgp, &mi355xChip})
637637      .Case (" mi350x"  , TargetDetails{cdna4Wgp, &mi350xChip})
638-       .Cases (" cdna4"  , " gfx950"  , TargetDetails{cdna4Wgp, nullptr })
638+       .Cases ({ " cdna4"  , " gfx950" } , TargetDetails{cdna4Wgp, nullptr })
639639      .Case (" mi325x"  , TargetDetails{cdna3Wgp, &mi325xChip})
640640      .Case (" mi300x"  , TargetDetails{cdna3Wgp, &mi300xChip})
641641      .Case (" mi300a"  , TargetDetails{cdna3Wgp, &mi300aChip})
642642      .Case (" mi308x"  , TargetDetails{cdna3Wgp, &mi308xChip})
643-       .Cases (" cdna3"  , " gfx942"  , TargetDetails{cdna3Wgp, nullptr })
643+       .Cases ({ " cdna3"  , " gfx942" } , TargetDetails{cdna3Wgp, nullptr })
644644      .Case (" mi250x"  , TargetDetails{cdna2Wgp, &mi250xChip})
645645      .Case (" mi250"  , TargetDetails{cdna2Wgp, &mi250Chip})
646646      .Case (" mi210"  , TargetDetails{cdna2Wgp, &mi210Chip})
647-       .Cases (" cdna2"  , " gfx90a"  , TargetDetails{cdna2Wgp, nullptr })
647+       .Cases ({ " cdna2"  , " gfx90a" } , TargetDetails{cdna2Wgp, nullptr })
648648      .Case (" mi100"  , TargetDetails{cdna1Wgp, &mi100Chip})
649-       .Cases (" cdna1"  , " gfx908"  , TargetDetails{cdna1Wgp, nullptr })
649+       .Cases ({ " cdna1"  , " gfx908" } , TargetDetails{cdna1Wgp, nullptr })
650650      //  https://www.techpowerup.com/gpu-specs/radeon-rx-9070-xt.c4229
651651      .Case (" rx9070xt"  , TargetDetails{rdna4Wgp, &rx9070xtChip})
652652      //  https://www.techpowerup.com/gpu-specs/radeon-rx-9070.c4250
@@ -671,29 +671,32 @@ std::optional<TargetDetails> getAMDGPUTargetDetails(StringRef target) {
671671      .Case (" w7800"  , TargetDetails{rdna3Wgp, &w7800Chip})
672672      //  https://www.techpowerup.com/gpu-specs/radeon-pro-w7700.c4184
673673      .Case (" w7700"  , TargetDetails{rdna3Wgp, &w7700Chip})
674-       .Cases (" rdna4"  , " gfx1200"  , " gfx1201"  , TargetDetails{rdna4Wgp, nullptr })
675-       .Cases (" rdna3"  , " gfx1100"  , " gfx1101"  , " gfx1102"  , " gfx1103"  , " gfx1150"  ,
676-              " gfx1151"  , TargetDetails{rdna3Wgp, nullptr })
677-       .Cases (" rdna2"  , " gfx1030"  , " gfx1031"  , " gfx1032"  , " gfx1033"  , " gfx1034"  ,
678-              " gfx1035"  , " gfx1036"  , TargetDetails{rdna2Wgp, nullptr })
679-       .Cases (" rdna1"  , " gfx1010"  , " gfx1011"  , " gfx1012"  , " gfx1013"  ,
674+       .Cases ({" rdna4"  , " gfx1200"  , " gfx1201"  }, TargetDetails{rdna4Wgp, nullptr })
675+       .Cases ({" rdna3"  , " gfx1100"  , " gfx1101"  , " gfx1102"  , " gfx1103"  , " gfx1150"  ,
676+               " gfx1151"  },
677+              TargetDetails{rdna3Wgp, nullptr })
678+       .Cases ({" rdna2"  , " gfx1030"  , " gfx1031"  , " gfx1032"  , " gfx1033"  , " gfx1034"  ,
679+               " gfx1035"  , " gfx1036"  },
680+              TargetDetails{rdna2Wgp, nullptr })
681+       .Cases ({" rdna1"  , " gfx1010"  , " gfx1011"  , " gfx1012"  , " gfx1013"  },
680682             TargetDetails{rdna1Wgp, nullptr })
681683      .Case (" gfx1250"  , TargetDetails{gfx1250Wgp, nullptr })
682684      .Default (std::nullopt );
683685}
684686
685687StringRef normalizeAMDGPUTarget (StringRef target) {
686688  return  llvm::StringSwitch<StringRef>(target.lower ())
687-       .Cases (" mi350x"  , " mi355x"  , " gfx950"  , /* Value=*/ " gfx950"  )
688-       .Cases (" mi300a"  , " mi300x"  , " mi308x"  , " mi325x"  , " gfx942"  ,
689+       .Cases ({ " mi350x"  , " mi355x"  , " gfx950" } , /* Value=*/ " gfx950"  )
690+       .Cases ({ " mi300a"  , " mi300x"  , " mi308x"  , " mi325x"  , " gfx942" } ,
689691             /* Value=*/ " gfx942"  )
690-       .Cases (" mi250x"  , " mi250"  , " mi210"  , " cdna2"  , " gfx90a"  , /* Value=*/ " gfx90a"  )
691-       .Cases (" mi100"  , " cdna1"  , " gfx908"  , /* Value=*/ " gfx908"  )
692-       .Cases (" rx9070xt"  , " rx9070"  , " r9700"  , " gfx1201"  , /* Value=*/ " gfx1201"  )
693-       .Cases (" rx9060xt"  , " gfx1200"  , /* Value=*/ " gfx1200"  )
694-       .Cases (" rx7900xtx"  , " rx7900xt"  , " w7900"  , " w7800"  , " gfx1100"  ,
692+       .Cases ({" mi250x"  , " mi250"  , " mi210"  , " cdna2"  , " gfx90a"  },
693+              /* Value=*/ " gfx90a"  )
694+       .Cases ({" mi100"  , " cdna1"  , " gfx908"  }, /* Value=*/ " gfx908"  )
695+       .Cases ({" rx9070xt"  , " rx9070"  , " r9700"  , " gfx1201"  }, /* Value=*/ " gfx1201"  )
696+       .Cases ({" rx9060xt"  , " gfx1200"  }, /* Value=*/ " gfx1200"  )
697+       .Cases ({" rx7900xtx"  , " rx7900xt"  , " w7900"  , " w7800"  , " gfx1100"  },
695698             /* Value=*/ " gfx1100"  )
696-       .Cases (" rx7800xt"  , " rx7700xt"  , " v710"  , " w7700"  , " gfx1101"  ,
699+       .Cases ({ " rx7800xt"  , " rx7700xt"  , " v710"  , " w7700"  , " gfx1101" } ,
697700             /* Value=*/ " gfx1101"  )
698701      .Case (" gfx1250"  , /* Value=*/ " gfx1250"  )
699702      .Default (" "  );
@@ -757,15 +760,15 @@ std::optional<TargetDetails> getARMGPUTargetDetails(StringRef target) {
757760
758761  return  llvm::StringSwitch<std::optional<TargetDetails>>(target.lower ())
759762      //  Mali-G715: https://vulkan.gpuinfo.org/displayreport.php?id=29754
760-       .Cases (" mali-g715"  , " mali-g615"  , " valhall4"  ,
763+       .Cases ({ " mali-g715"  , " mali-g615"  , " valhall4" } ,
761764             TargetDetails{valhallWgp, nullptr })
762765      //  Mali-G710: https://vulkan.gpuinfo.org/displayreport.php?id=30471
763-       .Cases (" mali-g710"  , " mali-g510"  , " mali-g310"  , " valhall3"  ,
766+       .Cases ({ " mali-g710"  , " mali-g510"  , " mali-g310"  , " valhall3" } ,
764767             TargetDetails{valhallWgp, nullptr })
765768      //  Mali-G78: https://vulkan.gpuinfo.org/displayreport.php?id=29994
766-       .Cases (" mali-g78"  , " valhall2"  , TargetDetails{valhallWgp, nullptr })
769+       .Cases ({ " mali-g78"  , " valhall2" } , TargetDetails{valhallWgp, nullptr })
767770      //  Mali-G57: https://vulkan.gpuinfo.org/displayreport.php?id=24636
768-       .Cases (" mali-g77"  , " mali-g57"  , " valhall1"  , " valhall"  ,
771+       .Cases ({ " mali-g77"  , " mali-g57"  , " valhall1"  , " valhall" } ,
769772             TargetDetails{valhallWgp, nullptr })
770773      .Default (std::nullopt );
771774}
@@ -777,10 +780,10 @@ StringRef normalizeARMGPUTarget(StringRef target) {
777780    return  target;
778781
779782  return  llvm::StringSwitch<StringRef>(target.lower ())
780-       .Cases (" mali-g715"  , " mali-g615"  , " valhall4"  )
781-       .Cases (" mali-g710"  , " mali-g510"  , " mali-g310"  , " valhall3"  )
783+       .Cases ({ " mali-g715"  , " mali-g615" } , " valhall4"  )
784+       .Cases ({ " mali-g710"  , " mali-g510"  , " mali-g310" } , " valhall3"  )
782785      .Case (" mali-78"  , " valhall2"  )
783-       .Cases (" mali-g77"  , " mali-g57"  , " valhall1"  )
786+       .Cases ({ " mali-g77"  , " mali-g57" } , " valhall1"  )
784787      .Default (" "  );
785788}
786789
@@ -901,11 +904,11 @@ std::optional<TargetDetails> getNVIDIAGPUTargetDetails(StringRef target) {
901904      .Case (" rtx3070ti"  , TargetDetails{ampereWgp, &rtx3070tiChip})
902905      //  https://www.techpowerup.com/gpu-specs/geforce-rtx-3070.c3674
903906      .Case (" rtx3070"  , TargetDetails{ampereWgp, &rtx3070Chip})
904-       .Cases (" ampere"  , " sm_80"  , " sm_86"  , " sm_87"  ,
907+       .Cases ({ " ampere"  , " sm_80"  , " sm_86"  , " sm_87" } ,
905908             TargetDetails{ampereWgp, nullptr })
906-       .Cases (" turing"  , " sm_75"  , TargetDetails{turingWgp, nullptr })
907-       .Cases (" volta"  , " sm_70"  , " sm_72"  , TargetDetails{voltaWgp, nullptr })
908-       .Cases (" pascal"  , " sm_60"  , " sm_61"  , " sm_62"  ,
909+       .Cases ({ " turing"  , " sm_75" } , TargetDetails{turingWgp, nullptr })
910+       .Cases ({ " volta"  , " sm_70"  , " sm_72" } , TargetDetails{voltaWgp, nullptr })
911+       .Cases ({ " pascal"  , " sm_60"  , " sm_61"  , " sm_62" } ,
909912             TargetDetails{pascalWgp, nullptr })
910913      .Default (std::nullopt );
911914}
0 commit comments