[llvm] r239162 - [bpf] rename triple names bpf_be -> bpfeb

Alexei Starovoitov alexei.starovoitov at gmail.com
Fri Jun 5 10:13:49 PDT 2015


On Fri, Jun 5, 2015 at 10:02 AM, Chandler Carruth <chandlerc at google.com> wrote:
> So, I don't get '<arch>eb' as an endian alternative.
>
> Maybe I'm just ignorant of the history here (likely), but I had always
> assumed that the joke with '<arch>el' is that its Little Endian, and thus
> the initials are E followed by L. For Big Endian, I would expect the
> initials to be B followed by E, and thus '<arch>be'....

There is armeb and thumbeb already.
and mipsel + mips64el + sparcel vs ppc64le.

I'm open to suggestions.

> On Fri, Jun 5, 2015 at 9:17 AM Alexei Starovoitov
> <alexei.starovoitov at gmail.com> wrote:
>>
>> Author: ast
>> Date: Fri Jun  5 11:11:14 2015
>> New Revision: 239162
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=239162&view=rev
>> Log:
>> [bpf] rename triple names bpf_be -> bpfeb
>>
>> Modified:
>>     llvm/trunk/include/llvm/ADT/Triple.h
>>     llvm/trunk/lib/Support/Triple.cpp
>>     llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp
>>     llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
>>     llvm/trunk/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp
>>     llvm/trunk/test/CodeGen/BPF/alu8.ll
>>     llvm/trunk/test/CodeGen/BPF/atomics.ll
>>     llvm/trunk/test/CodeGen/BPF/basictest.ll
>>     llvm/trunk/test/CodeGen/BPF/cc_args.ll
>>     llvm/trunk/test/CodeGen/BPF/cc_args_be.ll
>>     llvm/trunk/test/CodeGen/BPF/cc_ret.ll
>>     llvm/trunk/test/CodeGen/BPF/ex1.ll
>>     llvm/trunk/test/CodeGen/BPF/intrinsics.ll
>>     llvm/trunk/test/CodeGen/BPF/load.ll
>>     llvm/trunk/test/CodeGen/BPF/loops.ll
>>     llvm/trunk/test/CodeGen/BPF/sanity.ll
>>     llvm/trunk/test/CodeGen/BPF/setcc.ll
>>     llvm/trunk/test/CodeGen/BPF/shifts.ll
>>     llvm/trunk/test/CodeGen/BPF/sockex2.ll
>>
>> Modified: llvm/trunk/include/llvm/ADT/Triple.h
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/Triple.h?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/include/llvm/ADT/Triple.h (original)
>> +++ llvm/trunk/include/llvm/ADT/Triple.h Fri Jun  5 11:11:14 2015
>> @@ -50,8 +50,8 @@ public:
>>      armeb,      // ARM (big endian): armeb
>>      aarch64,    // AArch64 (little endian): aarch64
>>      aarch64_be, // AArch64 (big endian): aarch64_be
>> -    bpf_le,     // eBPF or extended BPF or 64-bit BPF (little endian)
>> -    bpf_be,     // eBPF or extended BPF or 64-bit BPF (big endian)
>> +    bpfel,      // eBPF or extended BPF or 64-bit BPF (little endian)
>> +    bpfeb,      // eBPF or extended BPF or 64-bit BPF (big endian)
>>      hexagon,    // Hexagon: hexagon
>>      mips,       // MIPS: mips, mipsallegrex
>>      mipsel,     // MIPSEL: mipsel, mipsallegrexel
>>
>> Modified: llvm/trunk/lib/Support/Triple.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Triple.cpp?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/lib/Support/Triple.cpp (original)
>> +++ llvm/trunk/lib/Support/Triple.cpp Fri Jun  5 11:11:14 2015
>> @@ -25,8 +25,8 @@ const char *Triple::getArchTypeName(Arch
>>    case aarch64_be:  return "aarch64_be";
>>    case arm:         return "arm";
>>    case armeb:       return "armeb";
>> -  case bpf_le:      return "bpf_le";
>> -  case bpf_be:      return "bpf_be";
>> +  case bpfel:       return "bpfel";
>> +  case bpfeb:       return "bpfeb";
>>    case hexagon:     return "hexagon";
>>    case mips:        return "mips";
>>    case mipsel:      return "mipsel";
>> @@ -91,8 +91,8 @@ const char *Triple::getArchTypePrefix(Ar
>>    case amdgcn:
>>    case r600:        return "amdgpu";
>>
>> -  case bpf_le:
>> -  case bpf_be:      return "bpf";
>> +  case bpfel:
>> +  case bpfeb:       return "bpf";
>>
>>    case sparcv9:
>>    case sparcel:
>> @@ -198,13 +198,13 @@ const char *Triple::getEnvironmentTypeNa
>>  static Triple::ArchType parseBPFArch(StringRef ArchName) {
>>    if (ArchName.equals("bpf")) {
>>      if (sys::IsLittleEndianHost)
>> -      return Triple::bpf_le;
>> +      return Triple::bpfel;
>>      else
>> -      return Triple::bpf_be;
>> -  } else if (ArchName.equals("bpf_be")) {
>> -    return Triple::bpf_be;
>> -  } else if (ArchName.equals("bpf_le")) {
>> -    return Triple::bpf_le;
>> +      return Triple::bpfeb;
>> +  } else if (ArchName.equals("bpf_be") || ArchName.equals("bpfeb")) {
>> +    return Triple::bpfeb;
>> +  } else if (ArchName.equals("bpf_le") || ArchName.equals("bpfel")) {
>> +    return Triple::bpfel;
>>    } else {
>>      return Triple::UnknownArch;
>>    }
>> @@ -1009,8 +1009,8 @@ static unsigned getArchPointerBitWidth(l
>>    case llvm::Triple::aarch64:
>>    case llvm::Triple::aarch64_be:
>>    case llvm::Triple::amdgcn:
>> -  case llvm::Triple::bpf_le:
>> -  case llvm::Triple::bpf_be:
>> +  case llvm::Triple::bpfel:
>> +  case llvm::Triple::bpfeb:
>>    case llvm::Triple::le64:
>>    case llvm::Triple::mips64:
>>    case llvm::Triple::mips64el:
>> @@ -1047,8 +1047,8 @@ Triple Triple::get32BitArchVariant() con
>>    case Triple::aarch64:
>>    case Triple::aarch64_be:
>>    case Triple::amdgcn:
>> -  case Triple::bpf_le:
>> -  case Triple::bpf_be:
>> +  case Triple::bpfel:
>> +  case Triple::bpfeb:
>>    case Triple::msp430:
>>    case Triple::systemz:
>>    case Triple::ppc64le:
>> @@ -1112,8 +1112,8 @@ Triple Triple::get64BitArchVariant() con
>>
>>    case Triple::aarch64:
>>    case Triple::aarch64_be:
>> -  case Triple::bpf_le:
>> -  case Triple::bpf_be:
>> +  case Triple::bpfel:
>> +  case Triple::bpfeb:
>>    case Triple::le64:
>>    case Triple::amdil64:
>>    case Triple::amdgcn:
>>
>> Modified: llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp (original)
>> +++ llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp Fri Jun  5 11:11:14
>> 2015
>> @@ -30,7 +30,7 @@ extern "C" void LLVMInitializeBPFTarget(
>>
>>  // DataLayout: little or big endian
>>  static std::string computeDataLayout(StringRef TT) {
>> -  if (Triple(TT).getArch() == Triple::bpf_be)
>> +  if (Triple(TT).getArch() == Triple::bpfeb)
>>      return "E-m:e-p:64:64-i64:64-n32:64-S128";
>>    else
>>      return "e-m:e-p:64:64-i64:64-n32:64-S128";
>>
>> Modified: llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h (original)
>> +++ llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h Fri Jun  5
>> 11:11:14 2015
>> @@ -25,7 +25,7 @@ class Triple;
>>  class BPFMCAsmInfo : public MCAsmInfo {
>>  public:
>>    explicit BPFMCAsmInfo(const Triple &TT) {
>> -    if (TT.getArch() == Triple::bpf_be)
>> +    if (TT.getArch() == Triple::bpfeb)
>>        IsLittleEndian = false;
>>
>>      PrivateGlobalPrefix = ".L";
>>
>> Modified: llvm/trunk/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp (original)
>> +++ llvm/trunk/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp Fri Jun  5
>> 11:11:14 2015
>> @@ -21,8 +21,8 @@ extern "C" void LLVMInitializeBPFTargetI
>>    TargetRegistry::RegisterTarget(TheBPFTarget, "bpf",
>>                                   "BPF (host endian)",
>>                                   [](Triple::ArchType) { return false; },
>> true);
>> -  RegisterTarget<Triple::bpf_le, /*HasJIT=*/true> X(
>> -      TheBPFleTarget, "bpf_le", "BPF (little endian)");
>> -  RegisterTarget<Triple::bpf_be, /*HasJIT=*/true> Y(
>> -      TheBPFbeTarget, "bpf_be", "BPF (big endian)");
>> +  RegisterTarget<Triple::bpfel, /*HasJIT=*/true> X(
>> +      TheBPFleTarget, "bpfel", "BPF (little endian)");
>> +  RegisterTarget<Triple::bpfeb, /*HasJIT=*/true> Y(
>> +      TheBPFbeTarget, "bpfeb", "BPF (big endian)");
>>  }
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/alu8.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/alu8.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/alu8.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/alu8.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc -march=bpf_le -show-mc-encoding < %s | FileCheck %s
>> +; RUN: llc -march=bpfel -show-mc-encoding < %s | FileCheck %s
>>
>>  define i8 @mov(i8 %a, i8 %b) nounwind {
>>  ; CHECK-LABEL: mov:
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/atomics.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/atomics.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/atomics.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/atomics.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le -verify-machineinstrs -show-mc-encoding |
>> FileCheck %s
>> +; RUN: llc < %s -march=bpfel -verify-machineinstrs -show-mc-encoding |
>> FileCheck %s
>>
>>  ; CHECK-LABEL: test_load_add_32
>>  ; CHECK: xadd32
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/basictest.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/basictest.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/basictest.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/basictest.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le | FileCheck %s
>> +; RUN: llc < %s -march=bpfel | FileCheck %s
>>
>>  define i32 @test0(i32 %X) {
>>    %tmp.1 = add i32 %X, 1
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/cc_args.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/cc_args.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/cc_args.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/cc_args.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le -show-mc-encoding | FileCheck %s
>> +; RUN: llc < %s -march=bpfel -show-mc-encoding | FileCheck %s
>>
>>  define void @test() #0 {
>>  entry:
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/cc_args_be.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/cc_args_be.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/cc_args_be.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/cc_args_be.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_be -show-mc-encoding | FileCheck %s
>> +; RUN: llc < %s -march=bpfeb -show-mc-encoding | FileCheck %s
>>  ; test big endian
>>
>>  define void @test() #0 {
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/cc_ret.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/cc_ret.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/cc_ret.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/cc_ret.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le | FileCheck %s
>> +; RUN: llc < %s -march=bpfel | FileCheck %s
>>
>>  define void @test() #0 {
>>  entry:
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/ex1.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/ex1.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/ex1.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/ex1.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le | FileCheck %s
>> +; RUN: llc < %s -march=bpfel | FileCheck %s
>>
>>  %struct.bpf_context = type { i64, i64, i64, i64, i64, i64, i64 }
>>  %struct.sk_buff = type { i64, i64, i64, i64, i64, i64, i64 }
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/intrinsics.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/intrinsics.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/intrinsics.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/intrinsics.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le -show-mc-encoding | FileCheck %s
>> +; RUN: llc < %s -march=bpfel -show-mc-encoding | FileCheck %s
>>
>>  ; Function Attrs: nounwind uwtable
>>  define i32 @ld_b(i64 %foo, i64* nocapture %bar, i8* %ctx, i8* %ctx2) #0 {
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/load.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/load.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/load.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/load.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le | FileCheck %s
>> +; RUN: llc < %s -march=bpfel | FileCheck %s
>>
>>  define i16 @am1(i16* %a) nounwind {
>>    %1 = load i16, i16* %a
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/loops.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/loops.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/loops.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/loops.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le | FileCheck %s
>> +; RUN: llc < %s -march=bpfel | FileCheck %s
>>
>>  define zeroext i16 @add(i16* nocapture %a, i16 zeroext %n) nounwind
>> readonly {
>>  entry:
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/sanity.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/sanity.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/sanity.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/sanity.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le | FileCheck %s
>> +; RUN: llc < %s -march=bpfel | FileCheck %s
>>
>>  @foo_printf.fmt = private unnamed_addr constant [9 x i8] c"hello
>> \0A\00", align 1
>>
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/setcc.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/setcc.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/setcc.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/setcc.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc -march=bpf_le < %s | FileCheck %s
>> +; RUN: llc -march=bpfel < %s | FileCheck %s
>>
>>  define i16 @sccweqand(i16 %a, i16 %b) nounwind {
>>    %t1 = and i16 %a, %b
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/shifts.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/shifts.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/shifts.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/shifts.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le -show-mc-encoding | FileCheck %s
>> +; RUN: llc < %s -march=bpfel -show-mc-encoding | FileCheck %s
>>
>>  define zeroext i8 @lshr8(i8 zeroext %a, i8 zeroext %cnt) nounwind
>> readnone {
>>  entry:
>>
>> Modified: llvm/trunk/test/CodeGen/BPF/sockex2.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/BPF/sockex2.ll?rev=239162&r1=239161&r2=239162&view=diff
>>
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/BPF/sockex2.ll (original)
>> +++ llvm/trunk/test/CodeGen/BPF/sockex2.ll Fri Jun  5 11:11:14 2015
>> @@ -1,4 +1,4 @@
>> -; RUN: llc < %s -march=bpf_le -show-mc-encoding | FileCheck %s
>> +; RUN: llc < %s -march=bpfel -show-mc-encoding | FileCheck %s
>>
>>  %struct.bpf_map_def = type { i32, i32, i32, i32 }
>>  %struct.sk_buff = type opaque
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



More information about the llvm-commits mailing list