This is an archive of the discontinued LLVM Phabricator instance.

Differential D118578

[RISCV] Make Zfhmin in march imply F.
ClosedPublic

Authored by craig.topper on Jan 30 2022, 8:37 PM.

Details

Reviewers
asb
achieveartificialintelligence
luismarques
kito-cheng
Commits
rG20875fe8a5b1: [RISCV] Make Zfhmin in march imply F.
Summary

Zfhmin should imply F just like Zfh.

Diff Detail

Event Timeline

craig.topper created this revision.Jan 30 2022, 8:37 PM
Herald added subscribers: VincentWu, luke957, StephenFan and 24 others. · View Herald TranscriptJan 30 2022, 8:37 PM
craig.topper requested review of this revision.Jan 30 2022, 8:37 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJan 30 2022, 8:37 PM
Herald added subscribers: cfe-commits, • pcwang-thead, eopXD, MaskRay. · View Herald Transcript
Harbormaster completed remote builds in B146558: Diff 404419.Jan 30 2022, 9:35 PM
achieveartificialintelligence accepted this revision.EditedJan 31 2022, 4:31 AM

LGTM. Sorry for my previous wrong comment.

This revision is now accepted and ready to land.Jan 31 2022, 4:31 AM
This revision was landed with ongoing or failed builds.Jan 31 2022, 9:07 AM
Closed by commit rG20875fe8a5b1: [RISCV] Make Zfhmin in march imply F. (authored by craig.topper). · Explain Why
This revision was automatically updated to reflect the committed changes.
craig.topper added a commit: rG20875fe8a5b1: [RISCV] Make Zfhmin in march imply F..

Revision Contents

PathSize
clang/
test/
Preprocessor/
2 lines
llvm/
lib/
Support/
2 lines

Diff 404419

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

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
// CHECK-V-EXT: __riscv_vector 1 // CHECK-V-EXT: __riscv_vector 1
// RUN: %clang -target riscv32-unknown-linux-gnu \ // RUN: %clang -target riscv32-unknown-linux-gnu \
// RUN: -march=rv32izfhmin1p0 -x c -E -dM %s \ // RUN: -march=rv32izfhmin1p0 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZFHMIN-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZFHMIN-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64izfhmin1p0 -x c -E -dM %s \ // RUN: -march=rv64izfhmin1p0 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZFHMIN-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZFHMIN-EXT %s
// CHECK-ZFHMIN-EXT: __riscv_f 2000000{{$}}
// CHECK-ZFHMIN-EXT: __riscv_zfhmin 1000000{{$}} // CHECK-ZFHMIN-EXT: __riscv_zfhmin 1000000{{$}}
// RUN: %clang -target riscv32-unknown-linux-gnu \ // RUN: %clang -target riscv32-unknown-linux-gnu \
// RUN: -march=rv32izfh1p0 -x c -E -dM %s \ // RUN: -march=rv32izfh1p0 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64izfh1p0 -x c -E -dM %s \ // RUN: -march=rv64izfh1p0 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s
// CHECK-ZFH-EXT: __riscv_f 2000000{{$}}
// CHECK-ZFH-EXT: __riscv_zfh 1000000{{$}} // CHECK-ZFH-EXT: __riscv_zfh 1000000{{$}}
// RUN: %clang -target riscv32-unknown-linux-gnu \ // RUN: %clang -target riscv32-unknown-linux-gnu \
// RUN: -march=rv64iv1p0 -x c -E -dM %s -o - \ // RUN: -march=rv64iv1p0 -x c -E -dM %s -o - \
// RUN: | FileCheck --check-prefix=CHECK-V-MINVLEN %s // RUN: | FileCheck --check-prefix=CHECK-V-MINVLEN %s
// CHECK-V-MINVLEN: __riscv_v_elen 64 // CHECK-V-MINVLEN: __riscv_v_elen 64
// CHECK-V-MINVLEN: __riscv_v_elen_fp 64 // CHECK-V-MINVLEN: __riscv_v_elen_fp 64
// CHECK-V-MINVLEN: __riscv_v_min_vlen 128 // CHECK-V-MINVLEN: __riscv_v_min_vlen 128
▲ Show 20 Lines • Show All 99 Lines • Show Last 20 Lines

llvm/lib/Support/RISCVISAInfo.cpp

//===-- RISCVISAInfo.cpp - RISCV Arch String Parser --------------===// //===-- RISCVISAInfo.cpp - RISCV Arch String Parser --------------===//
Lint: Lint
Inline Actions

clang-format not found in user’s local PATH; not linting file.

Lint: Lint: clang-format not found in user’s local PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
▲ Show 20 Lines • Show All 723 Lines • ▼ Show 20 LinesError RISCVISAInfo::checkDependency() {
// Additional dependency checks. // Additional dependency checks.
// TODO: The 'q' extension requires rv64. // TODO: The 'q' extension requires rv64.
// TODO: It is illegal to specify 'e' extensions with 'f' and 'd'. // TODO: It is illegal to specify 'e' extensions with 'f' and 'd'.
return Error::success(); return Error::success();
} }
static const char *ImpliedExtsV[] = {"zvl128b", "f", "d"}; static const char *ImpliedExtsV[] = {"zvl128b", "f", "d"};
static const char *ImpliedExtsZfhmin[] = {"f"};
static const char *ImpliedExtsZfh[] = {"zfhmin"}; static const char *ImpliedExtsZfh[] = {"zfhmin"};
static const char *ImpliedExtsZve64d[] = {"zve64f"}; static const char *ImpliedExtsZve64d[] = {"zve64f"};
static const char *ImpliedExtsZve64f[] = {"zve64x", "zve32f"}; static const char *ImpliedExtsZve64f[] = {"zve64x", "zve32f"};
static const char *ImpliedExtsZve64x[] = {"zve32x", "zvl64b"}; static const char *ImpliedExtsZve64x[] = {"zve32x", "zvl64b"};
static const char *ImpliedExtsZve32f[] = {"zve32x"}; static const char *ImpliedExtsZve32f[] = {"zve32x"};
static const char *ImpliedExtsZve32x[] = {"zvl32b"}; static const char *ImpliedExtsZve32x[] = {"zvl32b"};
static const char *ImpliedExtsZvl65536b[] = {"zvl32768b"}; static const char *ImpliedExtsZvl65536b[] = {"zvl32768b"};
static const char *ImpliedExtsZvl32768b[] = {"zvl16384b"}; static const char *ImpliedExtsZvl32768b[] = {"zvl16384b"};
Show All 19 Linesstruct ImpliedExtsEntry {
} }
bool operator<(StringRef Other) const { return Name < Other; } bool operator<(StringRef Other) const { return Name < Other; }
}; };
static constexpr ImpliedExtsEntry ImpliedExts[] = { static constexpr ImpliedExtsEntry ImpliedExts[] = {
{{"v"}, {ImpliedExtsV}}, {{"v"}, {ImpliedExtsV}},
{{"zfh"}, {ImpliedExtsZfh}}, {{"zfh"}, {ImpliedExtsZfh}},
{{"zfhmin"}, {ImpliedExtsZfhmin}},
{{"zk"}, {ImpliedExtsZk}}, {{"zk"}, {ImpliedExtsZk}},
{{"zkn"}, {ImpliedExtsZkn}}, {{"zkn"}, {ImpliedExtsZkn}},
{{"zks"}, {ImpliedExtsZks}}, {{"zks"}, {ImpliedExtsZks}},
{{"zve32f"}, {ImpliedExtsZve32f}}, {{"zve32f"}, {ImpliedExtsZve32f}},
{{"zve32x"}, {ImpliedExtsZve32x}}, {{"zve32x"}, {ImpliedExtsZve32x}},
{{"zve64d"}, {ImpliedExtsZve64d}}, {{"zve64d"}, {ImpliedExtsZve64d}},
{{"zve64f"}, {ImpliedExtsZve64f}}, {{"zve64f"}, {ImpliedExtsZve64f}},
{{"zve64x"}, {ImpliedExtsZve64x}}, {{"zve64x"}, {ImpliedExtsZve64x}},
▲ Show 20 Lines • Show All 135 Lines • Show Last 20 Lines