[RISCV] Add missing e_flag EF_RISCV_TSO

[StephenFan]

Summary

This flag was defined here https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc

[jrtc27]

Commit message needs s/R_/EF_/

llvm/test/Object/RISCV/elf-flags.yaml

26

Please fix

llvm/tools/llvm-readobj/ELFDumper.cpp

1572–1573

Keep formatting consistent with the surroundings

[StephenFan]

@jrtc27 Thanks for your review!

1. Change commit log.
2. Add end line and change format.

[StephenFan]

fix

[jhenderson]

LGTM. Probably should wait for @jrtc27 too.

[MaskRay]

llvm/include/llvm/BinaryFormat/ELF.h

656

add trailing comma

llvm/tools/llvm-readobj/ELFDumper.cpp

1571

add trailing comma

[StephenFan]

llvm/tools/llvm-readobj/ELFDumper.cpp

1571

Thanks for your review! @MaskRay

ENUM_ENT(EF_RISCV_TSO, "TSO") is the last item in array ElfHeaderRISCVFlags, and I found the surrounding arrays similar to it also do not have a trailing comma. Should I still need to add a trailing comma ?

[MaskRay]

llvm/tools/llvm-readobj/ELFDumper.cpp

1571

You can ignore the surrounding arrays

[StephenFan]

Add trailing comma.

[luke957]

So sorry for my bad herald script.

[luismarques]

ping: land?

llvm/include/llvm/BinaryFormat/ELF.h

 // RISCV Specific e_flags
 enum : unsigned {
   EF_RISCV_RVC = 0x0001,
   EF_RISCV_FLOAT_ABI = 0x0006,
   EF_RISCV_FLOAT_ABI_SOFT = 0x0000,
   EF_RISCV_FLOAT_ABI_SINGLE = 0x0002,
   EF_RISCV_FLOAT_ABI_DOUBLE = 0x0004,
   EF_RISCV_FLOAT_ABI_QUAD = 0x0006,
-  EF_RISCV_RVE = 0x0008
+  EF_RISCV_RVE = 0x0008,
+  EF_RISCV_TSO = 0x0010
 };
 
 // ELF Relocation types for RISC-V
 enum {
 #include "ELFRelocs/RISCV.def"
 };
 
 enum {

llvm/lib/ObjectYAML/ELFYAML.cpp

case ELF::EM_AVR:
     break;
   case ELF::EM_RISCV:
     BCase(EF_RISCV_RVC);
     BCaseMask(EF_RISCV_FLOAT_ABI_SOFT, EF_RISCV_FLOAT_ABI);
     BCaseMask(EF_RISCV_FLOAT_ABI_SINGLE, EF_RISCV_FLOAT_ABI);
     BCaseMask(EF_RISCV_FLOAT_ABI_DOUBLE, EF_RISCV_FLOAT_ABI);
     BCaseMask(EF_RISCV_FLOAT_ABI_QUAD, EF_RISCV_FLOAT_ABI);
     BCase(EF_RISCV_RVE);
+    BCase(EF_RISCV_TSO);
     break;
   case ELF::EM_AMDGPU:
     BCaseMask(EF_AMDGPU_MACH_NONE, EF_AMDGPU_MACH);
     BCaseMask(EF_AMDGPU_MACH_R600_R600, EF_AMDGPU_MACH);
     BCaseMask(EF_AMDGPU_MACH_R600_R630, EF_AMDGPU_MACH);
     BCaseMask(EF_AMDGPU_MACH_R600_RS880, EF_AMDGPU_MACH);
     BCaseMask(EF_AMDGPU_MACH_R600_RV670, EF_AMDGPU_MACH);
     BCaseMask(EF_AMDGPU_MACH_R600_RV710, EF_AMDGPU_MACH);

llvm/test/Object/RISCV/elf-flags.yaml

 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj --file-headers %t | FileCheck -check-prefix=OBJ %s
 # RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s
 
-# OBJ: Flags [ (0xD)
+# OBJ: Flags [ (0x1D)
 # OBJ-NEXT:   EF_RISCV_FLOAT_ABI_DOUBLE (0x4)
 # OBJ-NEXT:   EF_RISCV_RVC (0x1)
 # OBJ-NEXT:   EF_RISCV_RVE (0x8)
+# OBJ-NEXT:   EF_RISCV_TSO (0x10)
 # OBJ-NEXT: ]
 
 # YAML:      FileHeader:
 # YAML-NEXT:   Class:           ELFCLASS32
 # YAML-NEXT:   Data:            ELFDATA2LSB
 # YAML-NEXT:   Type:            ET_EXEC
 # YAML-NEXT:   Machine:         EM_RISCV
-# YAML-NEXT:   Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_DOUBLE, EF_RISCV_RVE ]
+# YAML-NEXT:   Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_DOUBLE, EF_RISCV_RVE, EF_RISCV_TSO ]
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS32
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
   Machine:         EM_RISCV
-  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_DOUBLE, EF_RISCV_RVE ]
+  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_DOUBLE, EF_RISCV_RVE, EF_RISCV_TSO ]

llvm/tools/llvm-readobj/ELFDumper.cpp

 //===- ELFDumper.cpp - ELF-specific dumper --------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_XNACK_OFF_V4),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_XNACK_ON_V4),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_ANY_V4),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_OFF_V4),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_ON_V4)
 };
 
 static const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = {
   ENUM_ENT(EF_RISCV_RVC, "RVC"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_SINGLE, "single-float ABI"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_DOUBLE, "double-float ABI"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_QUAD, "quad-float ABI"),
-  ENUM_ENT(EF_RISCV_RVE, "RVE")
+  ENUM_ENT(EF_RISCV_RVE, "RVE"),
+  ENUM_ENT(EF_RISCV_TSO, "TSO")
 };
 
 static const EnumEntry<unsigned> ElfHeaderAVRFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR1),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR2),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR25),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR3),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR31),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR35),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR4),