Commit 29b44ca8 authored by Huber, Joseph's avatar Huber, Joseph
Browse files

[OpenMP] Add flag for setting debug in the offloading device 

This patch introduces the flags `-fopenmp-target-debug` and
`-fopenmp-target-debug=` to set the value of a global in the device.
This will be used to enable or disable debugging features statically in
the device runtime library.

Reviewed By: jdoerfert

Differential Revision: https://reviews.llvm.org/D109544
parent 7eb899cb

clang/include/clang/Basic/DiagnosticDriverKinds.td

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ def err_drv_optimization_remark_format : Error< 
  "unknown remark serializer format: '%0'">;

def err_drv_no_neon_modifier : Error<"[no]neon is not accepted as modifier, please use [no]simd instead">;

def err_drv_invalid_omp_target : Error<"OpenMP target is invalid: '%0'">;

def err_drv_debug_no_new_runtime : Error<"OpenMP target device debugging enabled with incompatible runtime">;

def err_drv_incompatible_omp_arch : Error<"OpenMP target architecture '%0' pointer size is incompatible with host '%1'">;

def err_drv_omp_host_ir_file_not_found : Error<

  "provided host compiler IR file '%0' is required to generate code for OpenMP "

clang/include/clang/Basic/LangOptions.def

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ LANGOPT(OpenMPCUDANumSMs , 32, 0, "Number of SMs for CUDA devices.") 
LANGOPT(OpenMPCUDABlocksPerSM  , 32, 0, "Number of blocks per SM for CUDA devices.")

LANGOPT(OpenMPCUDAReductionBufNum , 32, 1024, "Number of the reduction records in the intermediate reduction buffer used for the teams reductions.")

LANGOPT(OpenMPTargetNewRuntime , 1, 0, "Use the new bitcode library for OpenMP offloading")

LANGOPT(OpenMPTargetDebug , 32, 0, "Enable debugging in the OpenMP offloading device RTL")

LANGOPT(OpenMPOptimisticCollapse  , 1, 0, "Use at most 32 bits to represent the collapsed loop nest counter.")

LANGOPT(RenderScript      , 1, 0, "RenderScript")

clang/include/clang/Driver/Options.td

+4 −0
Original line number Diff line number Diff line
@@ -2411,6 +2411,10 @@ def fopenmp_cuda_blocks_per_sm_EQ : Joined<["-"], "fopenmp-cuda-blocks-per-sm="> 
  Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;

def fopenmp_cuda_teams_reduction_recs_num_EQ : Joined<["-"], "fopenmp-cuda-teams-reduction-recs-num=">, Group<f_Group>,

  Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;

def fopenmp_target_debug : Flag<["-"], "fopenmp-target-debug">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused]>,

  HelpText<"Enable debugging in the OpenMP offloading device RTL">;

def fno_openmp_target_debug : Flag<["-"], "fno-openmp-target-debug">, Group<f_Group>, Flags<[NoArgumentUnused]>;

def fopenmp_target_debug_EQ : Joined<["-"], "fopenmp-target-debug=">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;

defm openmp_target_new_runtime: BoolFOption<"openmp-target-new-runtime",

  LangOpts<"OpenMPTargetNewRuntime">, DefaultFalse,

  PosFlag<SetTrue, [CC1Option], "Use the new bitcode library for OpenMP offloading">,

clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1197,6 +1197,10 @@ CGOpenMPRuntimeGPU::CGOpenMPRuntimeGPU(CodeGenModule &CGM) 
    : CGOpenMPRuntime(CGM, "_", "$") {

  if (!CGM.getLangOpts().OpenMPIsDevice)

    llvm_unreachable("OpenMP NVPTX can only handle device code.");



  llvm::OpenMPIRBuilder &OMPBuilder = getOMPBuilder();

  if (CGM.getLangOpts().OpenMPTargetNewRuntime)

    OMPBuilder.createDebugKind(CGM.getLangOpts().OpenMPTargetDebug);

}



void CGOpenMPRuntimeGPU::emitProcBindClause(CodeGenFunction &CGF,

clang/lib/Driver/ToolChains/Clang.cpp

+13 −0
Original line number Diff line number Diff line
@@ -5756,6 +5756,19 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, 
                       options::OPT_fno_openmp_cuda_mode, /*Default=*/false))

        CmdArgs.push_back("-fopenmp-cuda-mode");



      // When in OpenMP offloading mode, enable or disable the new device

      // runtime.

      if (Args.hasFlag(options::OPT_fopenmp_target_new_runtime,

                       options::OPT_fno_openmp_target_new_runtime,

                       /*Default=*/false))

        CmdArgs.push_back("-fopenmp-target-new-runtime");



      // When in OpenMP offloading mode, enable debugging on the device.

      Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_target_debug_EQ);

      if (Args.hasFlag(options::OPT_fopenmp_target_debug,

                       options::OPT_fno_openmp_target_debug, /*Default=*/false))

        CmdArgs.push_back("-fopenmp-target-debug");



      // When in OpenMP offloading mode with NVPTX target, check if full runtime

      // is required.

      if (Args.hasFlag(options::OPT_fopenmp_cuda_force_full_runtime,