Commit 57cf6ee9 authored by Scott Egerton's avatar Scott Egerton
Browse files

[RISCV] Add Clang frontend support for Bitmanip extension 

Summary: This adds the __riscv_bitmanip macro and the 'b' target feature to enable it.

Reviewers: asb, simoncook, lewis-revill, PaoloS, lenary

Reviewed By: lenary

Subscribers: Jim, rbar, johnrusso, sabuasal, niosHD, kito-cheng, shiva0217, jrtc27, MaskRay, zzheng, edward-jones, rogfer01, MartinMosbeck, brucehoult, the_o, rkruppe, PkmX, jocewei, psnobl, benna, pzheng, sameer.abuasal, apazos, luismarques, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D71553
parent fd19ffc6

clang/lib/Basic/Targets/RISCV.cpp

+7 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts, 


  if (HasC)

    Builder.defineMacro("__riscv_compressed");



  if (HasB) {

    Builder.defineMacro("__riscv_bitmanip");

  }

}



/// Return true if has this feature, need to sync with handleTargetFeatures.
@@ -139,6 +143,7 @@ bool RISCVTargetInfo::hasFeature(StringRef Feature) const { 
      .Case("f", HasF)

      .Case("d", HasD)

      .Case("c", HasC)

      .Case("b", HasB)

      .Default(false);

}
@@ -156,6 +161,8 @@ bool RISCVTargetInfo::handleTargetFeatures(std::vector<std::string> &Features, 
      HasD = true;

    else if (Feature == "+c")

      HasC = true;

    else if (Feature == "+b")

      HasB = true;

  }



  return true;

clang/lib/Basic/Targets/RISCV.h

+2 −1
Original line number Diff line number Diff line
@@ -30,11 +30,12 @@ protected: 
  bool HasF;

  bool HasD;

  bool HasC;

  bool HasB;



public:

  RISCVTargetInfo(const llvm::Triple &Triple, const TargetOptions &)

      : TargetInfo(Triple), HasM(false), HasA(false), HasF(false),

        HasD(false), HasC(false) {

        HasD(false), HasC(false), HasB(false) {

    LongDoubleWidth = 128;

    LongDoubleAlign = 128;

    LongDoubleFormat = &llvm::APFloat::IEEEquad();

clang/lib/Driver/ToolChains/Arch/RISCV.cpp

+3 −0
Original line number Diff line number Diff line
@@ -331,6 +331,9 @@ static bool getArchFeatures(const Driver &D, StringRef MArch, 
    case 'c':

      Features.push_back("+c");

      break;

    case 'b':

      Features.push_back("+b");

      break;

    }

  }

clang/test/Preprocessor/riscv-target-features.c

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
// CHECK-NOT: __riscv_mul

// CHECK-NOT: __riscv_muldiv

// CHECK-NOT: __riscv_compressed

// CHECK-NOT: __riscv_bitmanip

// CHECK-NOT: __riscv_flen

// CHECK-NOT: __riscv_fdiv

// CHECK-NOT: __riscv_fsqrt
@@ -48,6 +49,12 @@ 
// RUN: -o - | FileCheck --check-prefix=CHECK-C-EXT %s

// CHECK-C-EXT: __riscv_compressed 1



// RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32ib -x c -E -dM %s \

// RUN: -o - | FileCheck --check-prefix=CHECK-B-EXT %s

// RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64ib -x c -E -dM %s \

// RUN: -o - | FileCheck --check-prefix=CHECK-B-EXT %s

// CHECK-B-EXT: __riscv_bitmanip 1



// RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32ifd -mabi=ilp32 -x c -E -dM %s \

// RUN: -o - | FileCheck --check-prefix=CHECK-SOFT %s

// RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64ifd -mabi=lp64 -x c -E -dM %s \