This is an archive of the discontinued LLVM Phabricator instance.

Differential D67066

[RISCV] Add option aliases: -mcmodel=medany and -mcmodel=medlow
ClosedPublic

Authored by kito-cheng on Sep 2 2019, 2:14 AM.

Details

Reviewers
asb
apazos
lenary
Commits
rG42fe2fc8c935: [RISCV] Add option aliases: -mcmodel=medany and -mcmodel=medlow
rL372080: [RISCV] Add option aliases: -mcmodel=medany and -mcmodel=medlow
rC372080: [RISCV] Add option aliases: -mcmodel=medany and -mcmodel=medlow
Summary

RISC-V GCC use -mcmodel=medany and -mcmodel=medlow, but LLVM use -mcmodel=small and -mcmodel=medium.

Add those two option aliases to provide same user interface between GCC and LLVM.

Diff Detail

Event Timeline

kito-cheng created this revision.Sep 2 2019, 2:14 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 2 2019, 2:14 AM
Herald added subscribers: cfe-commits, pzheng, s.egerton and 20 others. · View Herald Transcript
kito-cheng added a parent revision: D67065: [RISCV] Define __riscv_cmodel_medlow and __riscv_cmodel_medany correctly.Sep 2 2019, 2:14 AM
lenary accepted this revision.Sep 12 2019, 5:40 AM

Looks good to me!

This revision is now accepted and ready to land.Sep 12 2019, 5:40 AM
Closed by commit rL372080: [RISCV] Add option aliases: -mcmodel=medany and -mcmodel=medlow (authored by kito). · Explain WhySep 17 2019, 1:18 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptSep 17 2019, 1:18 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
GitHub <noreply@github.com> mentioned this in rG7e4254552481: [Driver] Reject unsupported -mcmodel= (#70262).Oct 26 2023, 2:15 PM

Revision Contents

PathSize
clang/
include/
clang/
Driver/
6 lines
test/
Preprocessor/
10 lines

Diff 218313

clang/include/clang/Driver/Options.td

Show First 20 Lines • Show All 2,160 Lines • ▼ Show 20 Lines
def mrelax : Flag<["-"], "mrelax">, Group<m_riscv_Features_Group>, def mrelax : Flag<["-"], "mrelax">, Group<m_riscv_Features_Group>,
HelpText<"Enable linker relaxation">; HelpText<"Enable linker relaxation">;
def mno_relax : Flag<["-"], "mno-relax">, Group<m_riscv_Features_Group>, def mno_relax : Flag<["-"], "mno-relax">, Group<m_riscv_Features_Group>,
HelpText<"Disable linker relaxation">; HelpText<"Disable linker relaxation">;
def msave_restore : Flag<["-"], "msave-restore">, Group<m_riscv_Features_Group>, def msave_restore : Flag<["-"], "msave-restore">, Group<m_riscv_Features_Group>,
HelpText<"Enable using library calls for save and restore">; HelpText<"Enable using library calls for save and restore">;
def mno_save_restore : Flag<["-"], "mno-save-restore">, Group<m_riscv_Features_Group>, def mno_save_restore : Flag<["-"], "mno-save-restore">, Group<m_riscv_Features_Group>,
HelpText<"Disable using library calls for save and restore">; HelpText<"Disable using library calls for save and restore">;
def mcmodel_EQ_medlow : Flag<["-"], "mcmodel=medlow">, Group<m_riscv_Features_Group>,
Flags<[CC1Option]>, Alias<mcmodel_EQ>, AliasArgs<["small"]>,
HelpText<"Equivalent to -mcmodel=small, compatible with RISC-V gcc.">;
def mcmodel_EQ_medany : Flag<["-"], "mcmodel=medany">, Group<m_riscv_Features_Group>,
Flags<[CC1Option]>, Alias<mcmodel_EQ>, AliasArgs<["medium"]>,
HelpText<"Equivalent to -mcmodel=medium, compatible with RISC-V gcc.">;
def munaligned_access : Flag<["-"], "munaligned-access">, Group<m_arm_Features_Group>, def munaligned_access : Flag<["-"], "munaligned-access">, Group<m_arm_Features_Group>,
HelpText<"Allow memory accesses to be unaligned (AArch32/AArch64 only)">; HelpText<"Allow memory accesses to be unaligned (AArch32/AArch64 only)">;
def mno_unaligned_access : Flag<["-"], "mno-unaligned-access">, Group<m_arm_Features_Group>, def mno_unaligned_access : Flag<["-"], "mno-unaligned-access">, Group<m_arm_Features_Group>,
HelpText<"Force all memory accesses to be aligned (AArch32/AArch64 only)">; HelpText<"Force all memory accesses to be aligned (AArch32/AArch64 only)">;
def mstrict_align : Flag<["-"], "mstrict-align">, Alias<mno_unaligned_access>, Flags<[CC1Option,HelpHidden]>, def mstrict_align : Flag<["-"], "mstrict-align">, Alias<mno_unaligned_access>, Flags<[CC1Option,HelpHidden]>,
HelpText<"Force all memory accesses to be aligned (same as mno-unaligned-access)">; HelpText<"Force all memory accesses to be aligned (same as mno-unaligned-access)">;
def mno_thumb : Flag<["-"], "mno-thumb">, Group<m_arm_Features_Group>; def mno_thumb : Flag<["-"], "mno-thumb">, Group<m_arm_Features_Group>;
▲ Show 20 Lines • Show All 1,083 Lines • Show Last 20 Lines

clang/test/Preprocessor/riscv-cmodel.c

// RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \ // RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-MEDLOW %s // RUN: -o - | FileCheck --check-prefix=CHECK-MEDLOW %s
// RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \ // RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-MEDLOW %s // RUN: -o - | FileCheck --check-prefix=CHECK-MEDLOW %s
// RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \ // RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \
// RUN: -mcmodel=small -o - | FileCheck --check-prefix=CHECK-MEDLOW %s // RUN: -mcmodel=small -o - | FileCheck --check-prefix=CHECK-MEDLOW %s
// RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \ // RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \
// RUN: -mcmodel=small -o - | FileCheck --check-prefix=CHECK-MEDLOW %s // RUN: -mcmodel=small -o - | FileCheck --check-prefix=CHECK-MEDLOW %s
// RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \
// RUN: -mcmodel=medlow -o - | FileCheck --check-prefix=CHECK-MEDLOW %s
// RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \
// RUN: -mcmodel=medlow -o - | FileCheck --check-prefix=CHECK-MEDLOW %s
// CHECK-MEDLOW: #define __riscv_cmodel_medlow 1 // CHECK-MEDLOW: #define __riscv_cmodel_medlow 1
// CHECK-MEDLOW-NOT: __riscv_cmodel_medany // CHECK-MEDLOW-NOT: __riscv_cmodel_medany
// RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \ // RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \
// RUN: -mcmodel=medium -o - | FileCheck --check-prefix=CHECK-MEDANY %s // RUN: -mcmodel=medium -o - | FileCheck --check-prefix=CHECK-MEDANY %s
// RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \ // RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \
// RUN: -mcmodel=medium -o - | FileCheck --check-prefix=CHECK-MEDANY %s // RUN: -mcmodel=medium -o - | FileCheck --check-prefix=CHECK-MEDANY %s
// RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32i -x c -E -dM %s \
// RUN: -mcmodel=medany -o - | FileCheck --check-prefix=CHECK-MEDANY %s
// RUN: %clang -target riscv64-unknown-linux-gnu -march=rv64i -x c -E -dM %s \
// RUN: -mcmodel=medany -o - | FileCheck --check-prefix=CHECK-MEDANY %s
// CHECK-MEDANY: #define __riscv_cmodel_medany 1 // CHECK-MEDANY: #define __riscv_cmodel_medany 1
// CHECK-MEDANY-NOT: __riscv_cmodel_medlow // CHECK-MEDANY-NOT: __riscv_cmodel_medlow