Author: David Truby Date: 2024-09-30T17:26:07+01:00 New Revision: 00e4f81a294e8e2d78d572c76dd017a8af050cf0
URL: https://github.com/llvm/llvm-project/commit/00e4f81a294e8e2d78d572c76dd017a8af050cf0 DIFF: https://github.com/llvm/llvm-project/commit/00e4f81a294e8e2d78d572c76dd017a8af050cf0.diff LOG: Revert "[flang] Implement GETUID and GETGID intrinsics (#108017)" This reverts commit 054eadcb117ba7c86a99dff5c9d0ed101c7f17ea. Added: Modified: flang/docs/Intrinsics.md flang/include/flang/Evaluate/target.h flang/include/flang/Optimizer/Builder/IntrinsicCall.h flang/include/flang/Optimizer/Builder/Runtime/Intrinsics.h flang/include/flang/Runtime/extensions.h flang/include/flang/Tools/TargetSetup.h flang/lib/Evaluate/intrinsics.cpp flang/lib/Optimizer/Builder/IntrinsicCall.cpp flang/lib/Optimizer/Builder/Runtime/Intrinsics.cpp flang/lib/Semantics/check-call.cpp flang/lib/Semantics/check-call.h flang/lib/Semantics/expression.cpp flang/runtime/extensions.cpp flang/unittests/Optimizer/Builder/Runtime/CommandTest.cpp flang/unittests/Optimizer/CMakeLists.txt Removed: flang/test/Semantics/windows.f90 flang/unittests/Optimizer/Builder/Runtime/IntrinsicsTest.cpp ################################################################################ diff --git a/flang/docs/Intrinsics.md b/flang/docs/Intrinsics.md index e288fdeec6cd22..87716731ead855 100644 --- a/flang/docs/Intrinsics.md +++ b/flang/docs/Intrinsics.md @@ -765,7 +765,7 @@ This phase currently supports all the intrinsic procedures listed above but the | Coarray intrinsic functions | COSHAPE | | Object characteristic inquiry functions | ALLOCATED, ASSOCIATED, EXTENDS_TYPE_OF, IS_CONTIGUOUS, PRESENT, RANK, SAME_TYPE, STORAGE_SIZE | | Type inquiry intrinsic functions | BIT_SIZE, DIGITS, EPSILON, HUGE, KIND, MAXEXPONENT, MINEXPONENT, NEW_LINE, PRECISION, RADIX, RANGE, TINY| -| Non-standard intrinsic functions | AND, OR, XOR, SHIFT, ZEXT, IZEXT, COSD, SIND, TAND, ACOSD, ASIND, ATAND, ATAN2D, COMPL, EQV, NEQV, INT8, JINT, JNINT, KNINT, QCMPLX, DREAL, DFLOAT, QEXT, QFLOAT, QREAL, DNUM, NUM, JNUM, KNUM, QNUM, RNUM, RAN, RANF, ILEN, SIZEOF, MCLOCK, SECNDS, COTAN, IBCHNG, ISHA, ISHC, ISHL, IXOR, IARG, IARGC, NARGS, GETPID, NUMARG, BADDRESS, IADDR, CACHESIZE, EOF, FP_CLASS, INT_PTR_KIND, ISNAN, MALLOC, GETUID, GETGID | +| Non-standard intrinsic functions | AND, OR, XOR, SHIFT, ZEXT, IZEXT, COSD, SIND, TAND, ACOSD, ASIND, ATAND, ATAN2D, COMPL, EQV, NEQV, INT8, JINT, JNINT, KNINT, QCMPLX, DREAL, DFLOAT, QEXT, QFLOAT, QREAL, DNUM, NUM, JNUM, KNUM, QNUM, RNUM, RAN, RANF, ILEN, SIZEOF, MCLOCK, SECNDS, COTAN, IBCHNG, ISHA, ISHC, ISHL, IXOR, IARG, IARGC, NARGS, GETPID, NUMARG, BADDRESS, IADDR, CACHESIZE, EOF, FP_CLASS, INT_PTR_KIND, ISNAN, MALLOC | | Intrinsic subroutines |MVBITS (elemental), CPU_TIME, DATE_AND_TIME, EVENT_QUERY, EXECUTE_COMMAND_LINE, GET_COMMAND, GET_COMMAND_ARGUMENT, GET_ENVIRONMENT_VARIABLE, MOVE_ALLOC, RANDOM_INIT, RANDOM_NUMBER, RANDOM_SEED, SIGNAL, SLEEP, SYSTEM, SYSTEM_CLOCK | | Atomic intrinsic subroutines | ATOMIC_ADD | | Collective intrinsic subroutines | CO_REDUCE | diff --git a/flang/include/flang/Evaluate/target.h b/flang/include/flang/Evaluate/target.h index b347c549e012da..d076fcbf083078 100644 --- a/flang/include/flang/Evaluate/target.h +++ b/flang/include/flang/Evaluate/target.h @@ -102,11 +102,6 @@ class TargetCharacteristics { bool isPPC() const { return isPPC_; } void set_isPPC(bool isPPC = false); - bool isOSWindows() const { return isOSWindows_; } - void set_isOSWindows(bool isOSWindows = false) { - isOSWindows_ = isOSWindows; - }; - IeeeFeatures &ieeeFeatures() { return ieeeFeatures_; } const IeeeFeatures &ieeeFeatures() const { return ieeeFeatures_; } @@ -116,7 +111,6 @@ class TargetCharacteristics { std::uint8_t align_[common::TypeCategory_enumSize][maxKind]{}; bool isBigEndian_{false}; bool isPPC_{false}; - bool isOSWindows_{false}; bool areSubnormalsFlushedToZero_{false}; Rounding roundingMode_{defaultRounding}; std::size_t procedurePointerByteSize_{8}; diff --git a/flang/include/flang/Optimizer/Builder/IntrinsicCall.h b/flang/include/flang/Optimizer/Builder/IntrinsicCall.h index b2da6138fc9d8e..78bb82b17d4050 100644 --- a/flang/include/flang/Optimizer/Builder/IntrinsicCall.h +++ b/flang/include/flang/Optimizer/Builder/IntrinsicCall.h @@ -256,10 +256,6 @@ struct IntrinsicLibrary { llvm::ArrayRef<mlir::Value> args); void genGetCommandArgument(mlir::ArrayRef<fir::ExtendedValue> args); void genGetEnvironmentVariable(llvm::ArrayRef<fir::ExtendedValue>); - mlir::Value genGetGID(mlir::Type resultType, - llvm::ArrayRef<mlir::Value> args); - mlir::Value genGetUID(mlir::Type resultType, - llvm::ArrayRef<mlir::Value> args); fir::ExtendedValue genIall(mlir::Type, llvm::ArrayRef<fir::ExtendedValue>); mlir::Value genIand(mlir::Type, llvm::ArrayRef<mlir::Value>); fir::ExtendedValue genIany(mlir::Type, llvm::ArrayRef<fir::ExtendedValue>); diff --git a/flang/include/flang/Optimizer/Builder/Runtime/Intrinsics.h b/flang/include/flang/Optimizer/Builder/Runtime/Intrinsics.h index 49d8249d6bcbce..240de5a899d37b 100644 --- a/flang/include/flang/Optimizer/Builder/Runtime/Intrinsics.h +++ b/flang/include/flang/Optimizer/Builder/Runtime/Intrinsics.h @@ -47,9 +47,6 @@ void genDateAndTime(fir::FirOpBuilder &, mlir::Location, void genEtime(fir::FirOpBuilder &builder, mlir::Location loc, mlir::Value values, mlir::Value time); -mlir::Value genGetUID(fir::FirOpBuilder &, mlir::Location); -mlir::Value genGetGID(fir::FirOpBuilder &, mlir::Location); - void genRandomInit(fir::FirOpBuilder &, mlir::Location, mlir::Value repeatable, mlir::Value imageDistinct); void genRandomNumber(fir::FirOpBuilder &, mlir::Location, mlir::Value harvest); diff --git a/flang/include/flang/Runtime/extensions.h b/flang/include/flang/Runtime/extensions.h index 6a842bafc155f9..fef651f3b2eedb 100644 --- a/flang/include/flang/Runtime/extensions.h +++ b/flang/include/flang/Runtime/extensions.h @@ -20,14 +20,6 @@ #include <cstddef> #include <cstdint> -#ifdef _WIN32 -// UID and GID don't exist on Windows, these exist to avoid errors. -typedef std::uint32_t uid_t; -typedef std::uint32_t gid_t; -#else -#include "sys/types.h" //pid_t -#endif - extern "C" { // CALL FLUSH(n) antedates the Fortran 2003 FLUSH statement. @@ -43,12 +35,6 @@ std::int32_t FORTRAN_PROCEDURE_NAME(iargc)(); void FORTRAN_PROCEDURE_NAME(getarg)( std::int32_t &n, char *arg, std::int64_t length); -// Calls getgid() -gid_t RTNAME(GetGID)(); - -// Calls getuid() -uid_t RTNAME(GetUID)(); - // GNU extension subroutine GETLOG(C). void FORTRAN_PROCEDURE_NAME(getlog)(char *name, std::int64_t length); diff --git a/flang/include/flang/Tools/TargetSetup.h b/flang/include/flang/Tools/TargetSetup.h index f52b5ddaa8d49a..c8d32e8e87cf1e 100644 --- a/flang/include/flang/Tools/TargetSetup.h +++ b/flang/include/flang/Tools/TargetSetup.h @@ -59,9 +59,6 @@ namespace Fortran::tools { if (targetTriple.isPPC()) targetCharacteristics.set_isPPC(true); - if (targetTriple.isOSWindows()) - targetCharacteristics.set_isOSWindows(true); - // TODO: use target machine data layout to set-up the target characteristics // type size and alignment info. } diff --git a/flang/lib/Evaluate/intrinsics.cpp b/flang/lib/Evaluate/intrinsics.cpp index 2b11b40e27ad1b..17a09c080e72c4 100644 --- a/flang/lib/Evaluate/intrinsics.cpp +++ b/flang/lib/Evaluate/intrinsics.cpp @@ -523,9 +523,7 @@ static const IntrinsicInterface genericIntrinsicFunction[]{ {{"c", DefaultChar, Rank::scalar, Optionality::required, common::Intent::Out}}, TypePattern{IntType, KindCode::greaterOrEqualToKind, 4}}, - {"getgid", {}, DefaultInt}, {"getpid", {}, DefaultInt}, - {"getuid", {}, DefaultInt}, {"huge", {{"x", SameIntOrReal, Rank::anyOrAssumedRank, Optionality::required, common::Intent::In, {ArgFlag::canBeMoldNull}}}, diff --git a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp index 6c5bd3b9417e8e..4e6d92213c1241 100644 --- a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp +++ b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp @@ -293,9 +293,7 @@ static constexpr IntrinsicHandler handlers[]{ &I::genGetCwd, {{{"c", asBox}, {"status", asAddr, handleDynamicOptional}}}, /*isElemental=*/false}, - {"getgid", &I::genGetGID}, {"getpid", &I::genGetPID}, - {"getuid", &I::genGetUID}, {"iachar", &I::genIchar}, {"iall", &I::genIall, @@ -3652,14 +3650,6 @@ void IntrinsicLibrary::genGetCommand(llvm::ArrayRef<fir::ExtendedValue> args) { } } -// GETGID -mlir::Value IntrinsicLibrary::genGetGID(mlir::Type resultType, - llvm::ArrayRef<mlir::Value> args) { - assert(args.size() == 0 && "getgid takes no input"); - return builder.createConvert(loc, resultType, - fir::runtime::genGetGID(builder, loc)); -} - // GETPID mlir::Value IntrinsicLibrary::genGetPID(mlir::Type resultType, llvm::ArrayRef<mlir::Value> args) { @@ -3668,14 +3658,6 @@ mlir::Value IntrinsicLibrary::genGetPID(mlir::Type resultType, fir::runtime::genGetPID(builder, loc)); } -// GETUID -mlir::Value IntrinsicLibrary::genGetUID(mlir::Type resultType, - llvm::ArrayRef<mlir::Value> args) { - assert(args.size() == 0 && "getgid takes no input"); - return builder.createConvert(loc, resultType, - fir::runtime::genGetUID(builder, loc)); -} - // GET_COMMAND_ARGUMENT void IntrinsicLibrary::genGetCommandArgument( llvm::ArrayRef<fir::ExtendedValue> args) { diff --git a/flang/lib/Optimizer/Builder/Runtime/Intrinsics.cpp b/flang/lib/Optimizer/Builder/Runtime/Intrinsics.cpp index 6bdc7d8c6bc823..aff3cadc3c300d 100644 --- a/flang/lib/Optimizer/Builder/Runtime/Intrinsics.cpp +++ b/flang/lib/Optimizer/Builder/Runtime/Intrinsics.cpp @@ -120,22 +120,6 @@ void fir::runtime::genEtime(fir::FirOpBuilder &builder, mlir::Location loc, builder.create<fir::CallOp>(loc, runtimeFunc, args); } -mlir::Value fir::runtime::genGetGID(fir::FirOpBuilder &builder, - mlir::Location loc) { - auto runtimeFunc = - fir::runtime::getRuntimeFunc<mkRTKey(GetGID)>(loc, builder); - - return builder.create<fir::CallOp>(loc, runtimeFunc).getResult(0); -} - -mlir::Value fir::runtime::genGetUID(fir::FirOpBuilder &builder, - mlir::Location loc) { - auto runtimeFunc = - fir::runtime::getRuntimeFunc<mkRTKey(GetUID)>(loc, builder); - - return builder.create<fir::CallOp>(loc, runtimeFunc).getResult(0); -} - void fir::runtime::genRandomInit(fir::FirOpBuilder &builder, mlir::Location loc, mlir::Value repeatable, mlir::Value imageDistinct) { diff --git a/flang/lib/Semantics/check-call.cpp b/flang/lib/Semantics/check-call.cpp index 7c8427733e1dba..71d1c083c31278 100644 --- a/flang/lib/Semantics/check-call.cpp +++ b/flang/lib/Semantics/check-call.cpp @@ -2028,22 +2028,6 @@ bool CheckPPCIntrinsic(const Symbol &generic, const Symbol &specific, return false; } -bool CheckWindowsIntrinsic( - const Symbol &intrinsic, evaluate::FoldingContext &foldingContext) { - parser::ContextualMessages &messages{foldingContext.messages()}; - // TODO: there are other intrinsics that are unsupported on Windows that - // should be added here. - if (intrinsic.name() == "getuid") { - messages.Say( - "User IDs do not exist on Windows. This function will always return 1"_warn_en_US); - } - if (intrinsic.name() == "getgid") { - messages.Say( - "Group IDs do not exist on Windows. This function will always return 1"_warn_en_US); - } - return true; -} - bool CheckArguments(const characteristics::Procedure &proc, evaluate::ActualArguments &actuals, SemanticsContext &context, const Scope &scope, bool treatingExternalAsImplicit, diff --git a/flang/lib/Semantics/check-call.h b/flang/lib/Semantics/check-call.h index 46bc61a601bd34..8553f3a31efb52 100644 --- a/flang/lib/Semantics/check-call.h +++ b/flang/lib/Semantics/check-call.h @@ -41,8 +41,6 @@ bool CheckArguments(const evaluate::characteristics::Procedure &, bool CheckPPCIntrinsic(const Symbol &generic, const Symbol &specific, const evaluate::ActualArguments &actuals, evaluate::FoldingContext &context); -bool CheckWindowsIntrinsic( - const Symbol &intrinsic, evaluate::FoldingContext &context); bool CheckArgumentIsConstantExprInRange( const evaluate::ActualArguments &actuals, int index, int lowerBound, int upperBound, parser::ContextualMessages &messages); diff --git a/flang/lib/Semantics/expression.cpp b/flang/lib/Semantics/expression.cpp index 364f99d73f5cc8..182ea5d441956c 100644 --- a/flang/lib/Semantics/expression.cpp +++ b/flang/lib/Semantics/expression.cpp @@ -2916,9 +2916,6 @@ auto ExpressionAnalyzer::GetCalleeAndArguments(const parser::Name &name, } else { resolution = symbol; } - if (resolution && context_.targetCharacteristics().isOSWindows()) { - semantics::CheckWindowsIntrinsic(*resolution, GetFoldingContext()); - } if (!resolution || resolution->attrs().test(semantics::Attr::INTRINSIC)) { auto name{resolution ? resolution->name() : ultimate.name()}; if (std::optional<SpecificCall> specificCall{context_.intrinsics().Probe( diff --git a/flang/runtime/extensions.cpp b/flang/runtime/extensions.cpp index f2823ca770bc5f..be3833db88b07a 100644 --- a/flang/runtime/extensions.cpp +++ b/flang/runtime/extensions.cpp @@ -58,24 +58,6 @@ extern "C" { namespace Fortran::runtime { -gid_t RTNAME(GetGID)() { -#ifdef _WIN32 - // Group IDs don't exist on Windows, return 1 to avoid errors - return 1; -#else - return getgid(); -#endif -} - -uid_t RTNAME(GetUID)() { -#ifdef _WIN32 - // User IDs don't exist on Windows, return 1 to avoid errors - return 1; -#else - return getuid(); -#endif -} - void GetUsernameEnvVar(const char *envName, char *arg, std::int64_t length) { Descriptor name{*Descriptor::Create( 1, std::strlen(envName) + 1, const_cast<char *>(envName), 0)}; @@ -84,7 +66,6 @@ void GetUsernameEnvVar(const char *envName, char *arg, std::int64_t length) { RTNAME(GetEnvVariable) (name, &value, nullptr, false, nullptr, __FILE__, __LINE__); } - namespace io { // SUBROUTINE FLUSH(N) // FLUSH N diff --git a/flang/test/Semantics/windows.f90 b/flang/test/Semantics/windows.f90 deleted file mode 100644 index 8f9d1aa606c0a0..00000000000000 --- a/flang/test/Semantics/windows.f90 +++ /dev/null @@ -1,12 +0,0 @@ -! RUN: %python %S/test_errors.py %s %flang --target=x86_64-pc-windows-msvc -Werror -! RUN: %python %S/test_errors.py %s %flang --target=aarch64-pc-windows-msvc -Werror - -subroutine uid - !WARNING: User IDs do not exist on Windows. This function will always return 1 - i = getuid() -end subroutine uid - -subroutine gid - !WARNING: Group IDs do not exist on Windows. This function will always return 1 - i = getgid() -end subroutine gid diff --git a/flang/unittests/Optimizer/Builder/Runtime/CommandTest.cpp b/flang/unittests/Optimizer/Builder/Runtime/CommandTest.cpp index 8bc1e87814a98c..58a151447d5b4f 100644 --- a/flang/unittests/Optimizer/Builder/Runtime/CommandTest.cpp +++ b/flang/unittests/Optimizer/Builder/Runtime/CommandTest.cpp @@ -50,4 +50,4 @@ TEST_F(RuntimeCallTest, genGetPID) { mlir::Value result = fir::runtime::genGetPID(*firBuilder, loc); checkCallOp(result.getDefiningOp(), "_FortranAGetPID", /*nbArgs=*/0, /*addLocArgs=*/false); -} +} \ No newline at end of file diff --git a/flang/unittests/Optimizer/Builder/Runtime/IntrinsicsTest.cpp b/flang/unittests/Optimizer/Builder/Runtime/IntrinsicsTest.cpp deleted file mode 100644 index 1440a5fd01c2b1..00000000000000 --- a/flang/unittests/Optimizer/Builder/Runtime/IntrinsicsTest.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "flang/Optimizer/Builder/Runtime/Intrinsics.h" -#include "RuntimeCallTestBase.h" -#include "gtest/gtest.h" - -TEST_F(RuntimeCallTest, genGetGID) { - mlir::Location loc = firBuilder->getUnknownLoc(); - mlir::Value result = fir::runtime::genGetGID(*firBuilder, loc); - checkCallOp(result.getDefiningOp(), "_FortranAGetGID", /*nbArgs=*/0, - /*addLocArgs=*/false); -} - -TEST_F(RuntimeCallTest, genGetUID) { - mlir::Location loc = firBuilder->getUnknownLoc(); - mlir::Value result = fir::runtime::genGetUID(*firBuilder, loc); - checkCallOp(result.getDefiningOp(), "_FortranAGetUID", /*nbArgs=*/0, - /*addLocArgs=*/false); -} diff --git a/flang/unittests/Optimizer/CMakeLists.txt b/flang/unittests/Optimizer/CMakeLists.txt index c58fb226a175c9..7299e3ee0529a9 100644 --- a/flang/unittests/Optimizer/CMakeLists.txt +++ b/flang/unittests/Optimizer/CMakeLists.txt @@ -25,7 +25,6 @@ add_flang_unittest(FlangOptimizerTests Builder/Runtime/CommandTest.cpp Builder/Runtime/CharacterTest.cpp Builder/Runtime/DerivedTest.cpp - Builder/Runtime/IntrinsicsTest.cpp Builder/Runtime/NumericTest.cpp Builder/Runtime/RaggedTest.cpp Builder/Runtime/ReductionTest.cpp _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
