@@ -651,38 +651,18 @@ amd_comgr_status_t getElfIsaNameFromElfHeader(const ELFObjectFile<ELFT> *Obj,
651
651
std::string &ElfIsaName) {
652
652
auto ElfHeader = Obj->getELFFile ().getHeader ();
653
653
654
- switch (ElfHeader.e_ident [ELF::EI_CLASS]) {
655
- case ELF::ELFCLASSNONE:
656
- return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
657
- case ELF::ELFCLASS32:
658
- ElfIsaName += " r600" ;
659
- break ;
660
- case ELF::ELFCLASS64:
654
+ if (ElfHeader.e_ident [ELF::EI_CLASS] == ELF::ELFCLASS64)
661
655
ElfIsaName += " amdgcn" ;
662
- break ;
663
- }
664
656
665
657
if (ElfHeader.e_machine != ELF::EM_AMDGPU) {
666
658
return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
667
659
}
668
660
ElfIsaName += " -amd-" ;
669
661
670
- switch (ElfHeader.e_ident [ELF::EI_OSABI]) {
671
- case ELF::ELFOSABI_NONE:
672
- ElfIsaName += " unknown" ;
673
- break ;
674
- case ELF::ELFOSABI_AMDGPU_HSA:
662
+ if (ElfHeader.e_ident [ELF::EI_OSABI] == ELF::ELFOSABI_AMDGPU_HSA)
675
663
ElfIsaName += " amdhsa" ;
676
- break ;
677
- case ELF::ELFOSABI_AMDGPU_PAL:
678
- ElfIsaName += " amdpal" ;
679
- break ;
680
- case ELF::ELFOSABI_AMDGPU_MESA3D:
681
- ElfIsaName += " mesa3d" ;
682
- break ;
683
- default :
664
+ else
684
665
return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
685
- }
686
666
687
667
ElfIsaName += " --" ;
688
668
@@ -770,17 +750,10 @@ amd_comgr_status_t getElfIsaName(DataObject *DataP, std::string &IsaName) {
770
750
}
771
751
auto *Obj = ObjOrErr->get ();
772
752
773
- if (auto *ELF32LE = dyn_cast<ELF32LEObjectFile>(Obj)) {
774
- return getElfIsaNameImpl (ELF32LE, IsaName);
775
- }
776
- if (auto *ELF64LE = dyn_cast<ELF64LEObjectFile>(Obj)) {
753
+ if (auto *ELF64LE = dyn_cast<ELF64LEObjectFile>(Obj))
777
754
return getElfIsaNameImpl (ELF64LE, IsaName);
778
- }
779
- if (auto *ELF32BE = dyn_cast<ELF32BEObjectFile>(Obj)) {
780
- return getElfIsaNameImpl (ELF32BE, IsaName);
781
- }
782
- auto *ELF64BE = dyn_cast<ELF64BEObjectFile>(Obj);
783
- return getElfIsaNameImpl (ELF64BE, IsaName);
755
+ else
756
+ return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
784
757
}
785
758
786
759
amd_comgr_status_t getIsaIndex (StringRef IsaString, size_t &Index) {
0 commit comments