[bpf] rename triple names bpf_be -> bpfeb

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239162 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
index eb1bbd641ebbb8fbc89617648e752fff5b285b1a..1362fe37c42625ef5f2320e22f56245592f6776a 100644 (file)
--- a/include/llvm/ADT/Triple.h
+++ b/include/llvm/ADT/Triple.h
@@ -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

diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index 9312f4ceec5cb07e1d2348e43fe8aab9802bfc13..ad99386e6574fb859436b3cc0d316cdf3095637d 100644 (file)
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -25,8 +25,8 @@ const char *Triple::getArchTypeName(ArchType Kind) {
   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(ArchType Kind) {
   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::getEnvironmentTypeName(EnvironmentType Kind) {
 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(llvm::Triple::ArchType Arch) {
   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() const {
   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() const {
 
   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:

diff --git a/lib/Target/BPF/BPFTargetMachine.cpp b/lib/Target/BPF/BPFTargetMachine.cpp
index 198fe7ae9999b7433bdc176f2b5da4778c02c709..3329d5f87409f0d56468ed2bc6f9a72ceab2a05e 100644 (file)
--- a/lib/Target/BPF/BPFTargetMachine.cpp
+++ b/lib/Target/BPF/BPFTargetMachine.cpp
@@ -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";

diff --git a/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h b/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
index edaa9ce24686081fddc15ec82b90f224a0604191..d63bbf49294efc762021548ce508f7eb71581c23 100644 (file)
--- a/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
+++ b/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
@@ -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";

diff --git a/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp b/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp
index 406165bca1e58a151e4f480130b65fa809003203..a16dbae867b29749c55c1546a7cac42cb38792c3 100644 (file)
--- a/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp
+++ b/lib/Target/BPF/TargetInfo/BPFTargetInfo.cpp
@@ -21,8 +21,8 @@ extern "C" void LLVMInitializeBPFTargetInfo() {
   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)");
 }

diff --git a/test/CodeGen/BPF/alu8.ll b/test/CodeGen/BPF/alu8.ll
index 21083b1aaf8b9c5bf533bf8068f58c318122e9d2..c1c2bd29f247224a089a23cbdecc9d2d9c8e4f9e 100644 (file)
--- a/test/CodeGen/BPF/alu8.ll
+++ b/test/CodeGen/BPF/alu8.ll
@@ -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:

diff --git a/test/CodeGen/BPF/atomics.ll b/test/CodeGen/BPF/atomics.ll
index b6cb65f3aea422c2a0fc17dd10d3389939786855..a2e17d291968a09bb6a10d11d02599949dde9504 100644 (file)
--- a/test/CodeGen/BPF/atomics.ll
+++ b/test/CodeGen/BPF/atomics.ll
@@ -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

diff --git a/test/CodeGen/BPF/basictest.ll b/test/CodeGen/BPF/basictest.ll
index b1c1f8081601c4b474343016c2114309ee63ee04..82feb43d005cf3dea84c12fe1909757e9d7f9d06 100644 (file)
--- a/test/CodeGen/BPF/basictest.ll
+++ b/test/CodeGen/BPF/basictest.ll
@@ -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

diff --git a/test/CodeGen/BPF/cc_args.ll b/test/CodeGen/BPF/cc_args.ll
index 42ac830c1ba6deb306271a7fa31fab31b2bdaada..8e3f8604ac881d29306228add9f9b7e160efd207 100644 (file)
--- a/test/CodeGen/BPF/cc_args.ll
+++ b/test/CodeGen/BPF/cc_args.ll
@@ -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:

diff --git a/test/CodeGen/BPF/cc_args_be.ll b/test/CodeGen/BPF/cc_args_be.ll
index d5a6539aa5e5ba1a67ab57307f7ab780f47a9e69..59a7439728ba844eae09b937275666b34c312499 100644 (file)
--- a/test/CodeGen/BPF/cc_args_be.ll
+++ b/test/CodeGen/BPF/cc_args_be.ll
@@ -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 {

diff --git a/test/CodeGen/BPF/cc_ret.ll b/test/CodeGen/BPF/cc_ret.ll
index ea23bdebd1dde9ec18701083e76b46ca66b6c306..09574922f325bd81f12e041ed4fa770000a1b580 100644 (file)
--- a/test/CodeGen/BPF/cc_ret.ll
+++ b/test/CodeGen/BPF/cc_ret.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=bpf_le | FileCheck %s
+; RUN: llc < %s -march=bpfel | FileCheck %s
 
 define void @test() #0 {
 entry:

diff --git a/test/CodeGen/BPF/ex1.ll b/test/CodeGen/BPF/ex1.ll
index abf068ca9a3fda6d3d9417ae096bc7148fec7274..546e5d49da69ef396ed38359cdf79c2322fd5dfa 100644 (file)
--- a/test/CodeGen/BPF/ex1.ll
+++ b/test/CodeGen/BPF/ex1.ll
@@ -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 }

diff --git a/test/CodeGen/BPF/intrinsics.ll b/test/CodeGen/BPF/intrinsics.ll
index 586269751de650e7ba41b8ebf0b7c210ac58df04..483473e922fc5d9bb060ef4261f1e73d789ce617 100644 (file)
--- a/test/CodeGen/BPF/intrinsics.ll
+++ b/test/CodeGen/BPF/intrinsics.ll
@@ -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 {

diff --git a/test/CodeGen/BPF/load.ll b/test/CodeGen/BPF/load.ll
index 9787379c2817835f8732d569ec125fd64d2959aa..d4ba315b5f18b7461dbfdcbf604ad6d3eb71e701 100644 (file)
--- a/test/CodeGen/BPF/load.ll
+++ b/test/CodeGen/BPF/load.ll
@@ -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

diff --git a/test/CodeGen/BPF/loops.ll b/test/CodeGen/BPF/loops.ll
index 7a4d5dbcb34899d080d97c1863f6f11f49528b23..00be54b3bac57d9e793bea3eec2481e87a7c4be4 100644 (file)
--- a/test/CodeGen/BPF/loops.ll
+++ b/test/CodeGen/BPF/loops.ll
@@ -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:

diff --git a/test/CodeGen/BPF/sanity.ll b/test/CodeGen/BPF/sanity.ll
index b45f5a1186eafbd725973a744bc2fc29a1ad3d70..7f0ef889ff99d0702f28859a6bf50b90280ff408 100644 (file)
--- a/test/CodeGen/BPF/sanity.ll
+++ b/test/CodeGen/BPF/sanity.ll
@@ -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
 

diff --git a/test/CodeGen/BPF/setcc.ll b/test/CodeGen/BPF/setcc.ll
index 6198197d244f7baeb6271c57b71fd6e76d2db423..f6c6db6c6836e918cbb88ebe3f83b2906ba7140d 100644 (file)
--- a/test/CodeGen/BPF/setcc.ll
+++ b/test/CodeGen/BPF/setcc.ll
@@ -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

diff --git a/test/CodeGen/BPF/shifts.ll b/test/CodeGen/BPF/shifts.ll
index 77d02d76c05953d88527ffe7b04f135f71bfdbb5..cb000b92fcd924ca5a68da1d9f14c1364f697fae 100644 (file)
--- a/test/CodeGen/BPF/shifts.ll
+++ b/test/CodeGen/BPF/shifts.ll
@@ -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:

diff --git a/test/CodeGen/BPF/sockex2.ll b/test/CodeGen/BPF/sockex2.ll
index 99458a965a970e587d948f05bce4c1481688e2fa..d372a5982f686be4f6f1884ddded5756d33b0b8b 100644 (file)
--- a/test/CodeGen/BPF/sockex2.ll
+++ b/test/CodeGen/BPF/sockex2.ll
@@ -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