Revert "openmp: Add -foffload-memory"

This reverts commit 6c86aec56567424416e52372473c8f0694ce65a9.

diff --git a/gcc/common.opt b/gcc/common.opt
index 5bc253bbec85d45a06e13f968e3dc3a7dfb559d9..234e04aaae0dacaf3fd0b0e842e0267132d65a0c 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2423,22 +2423,6 @@ foffload-abi-host-opts=
 Common Joined MissingArgError(option missing after %qs)
 -foffload-abi-host-opts=<options>      Specify host ABI options.
 
-foffload-memory=
-Common Joined RejectNegative Enum(offload_memory) Var(flag_offload_memory) Init(OFFLOAD_MEMORY_NONE)
--foffload-memory=[none|unified|pinned] Use an offload memory optimization.
-
-Enum
-Name(offload_memory) Type(enum offload_memory) UnknownError(Unknown offload memory option %qs)
-
-EnumValue
-Enum(offload_memory) String(none) Value(OFFLOAD_MEMORY_NONE)
-
-EnumValue
-Enum(offload_memory) String(unified) Value(OFFLOAD_MEMORY_UNIFIED)
-
-EnumValue
-Enum(offload_memory) String(pinned) Value(OFFLOAD_MEMORY_PINNED)
-
 fomit-frame-pointer
 Common Var(flag_omit_frame_pointer) Optimization
 When possible do not generate stack frames.

diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index 3d483a58f52a61f1bfbfcba46490f4d6c7b15ca9..a11ebd1509b586c106bf3192bbb66e1f94f2ec10 100644 (file)
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -228,13 +228,6 @@ enum offload_abi {
   OFFLOAD_ABI_ILP32
 };
 
-/* Types of memory optimization for an offload device.  */
-enum offload_memory {
-  OFFLOAD_MEMORY_NONE,
-  OFFLOAD_MEMORY_UNIFIED,
-  OFFLOAD_MEMORY_PINNED
-};
-
 /* Types of profile update methods.  */
 enum profile_update {
   PROFILE_UPDATE_SINGLE,

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 7c2fa2c5e2c6ea67f671e94491093ebfcc522557..d4cb9e09bca772f142698d0e975d9e61610273c3 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -302,7 +302,6 @@ Objective-C and Objective-C++ Dialects}.
 @item OpenMP and OpenACC Options
 @xref{OpenMP and OpenACC Options,,Options Controlling OpenMP and OpenACC}.
 @gccoptlist{-foffload=@var{arg}  -foffload-options=@var{arg}
--foffload-memory=@var{arg}
 -fopenacc  -fopenacc-dim=@var{geom}
 -fopenmp  -fopenmp-simd  -fopenmp-target-simd-clone@r{[}=@var{device-type}@r{]}}
 
@@ -5236,20 +5235,6 @@ Typical command lines are
 -foffload-options=amdgcn-amdhsa=-march=gfx906
 @end smallexample
 
-@opindex foffload-memory
-@cindex OpenMP offloading memory modes
-@item -foffload-memory=none
-@itemx -foffload-memory=unified
-@itemx -foffload-memory=pinned
-Enable a memory optimization mode to use with OpenMP.  The default behavior,
-@option{-foffload-memory=none}, is to do nothing special (unless enabled via
-a requires directive in the code).  @option{-foffload-memory=unified} is
-equivalent to @code{#pragma omp requires unified_shared_memory}.
-@option{-foffload-memory=pinned} forces all host memory to be pinned (this
-mode may require the user to increase the ulimit setting for locked memory).
-All translation units must select the same setting to avoid undefined
-behavior.
-
 @opindex fopenacc
 @cindex OpenACC accelerator programming
 @item -fopenacc