AI/rocm-systems
2
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

SWDEV-356651 - Merge hipJit options between hiprtc and hip runtime.

Просмотр исходного кода 
Change-Id: I73b66eaf081ce63b6b7ce45f71880877953cf81c


[ROCm/clr commit: ab89a70f5d]
Этот коммит содержится в:
kjayapra-amd
2022-08-25 11:57:30 -07:00
коммит произвёл Karthik Jayaprakash
родитель 12c48303c8
Коммит 32838b0613
2 изменённых файлов: 76 добавлений и 52 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы
projects/clr/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h
+18 -18
Просмотреть файл
@@ -366,24 +366,24 @@ typedef enum cudaResourceViewFormat hipResourceViewFormat;
// enum CUjit_option redefines
#define hipJitOptionMaxRegisters CU_JIT_MAX_REGISTERS
#define hipJitOptionThreadsPerBlock CU_JIT_THREADS_PER_BLOCK
#define hipJitOptionWallTime CU_JIT_WALL_TIME
#define hipJitOptionInfoLogBuffer CU_JIT_INFO_LOG_BUFFER
#define hipJitOptionInfoLogBufferSizeBytes CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES
#define hipJitOptionErrorLogBuffer CU_JIT_ERROR_LOG_BUFFER
#define hipJitOptionErrorLogBufferSizeBytes CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES
#define hipJitOptionOptimizationLevel CU_JIT_OPTIMIZATION_LEVEL
#define hipJitOptionTargetFromContext CU_JIT_TARGET_FROM_CUCONTEXT
#define hipJitOptionTarget CU_JIT_TARGET
#define hipJitOptionFallbackStrategy CU_JIT_FALLBACK_STRATEGY
#define hipJitOptionGenerateDebugInfo CU_JIT_GENERATE_DEBUG_INFO
#define hipJitOptionLogVerbose CU_JIT_LOG_VERBOSE
#define hipJitOptionGenerateLineInfo CU_JIT_GENERATE_LINE_INFO
#define hipJitOptionCacheMode CU_JIT_CACHE_MODE
#define hipJitOptionSm3xOpt CU_JIT_NEW_SM3X_OPT
#define hipJitOptionFastCompile CU_JIT_FAST_COMPILE
#define hipJitOptionNumOptions CU_JIT_NUM_OPTIONS
#define HIPRTC_JIT_MAX_REGISTERS CU_JIT_MAX_REGISTERS
#define HIPRTC_JIT_THREADS_PER_BLOCK CU_JIT_THREADS_PER_BLOCK
#define HIPRTC_JIT_WALL_TIME CU_JIT_WALL_TIME
#define HIPRTC_JIT_INFO_LOG_BUFFER CU_JIT_INFO_LOG_BUFFER
#define HIPRTC_JIT_INFO_LOG_BUFFER_SIZE_BYTES CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES
#define HIPRTC_JIT_ERROR_LOG_BUFFER CU_JIT_ERROR_LOG_BUFFER
#define HIPRTC_JIT_ERROR_LOG_BUFFER_SIZE_BYTES CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES
#define HIPRTC_JIT_OPTIMIZATION_LEVEL CU_JIT_OPTIMIZATION_LEVEL
#define HIPRTC_JIT_TARGET_FROM_HIPCONTEXT CU_JIT_TARGET_FROM_CUCONTEXT
#define HIPRTC_JIT_TARGET CU_JIT_TARGET
#define HIPRTC_JIT_FALLBACK_STRATEGY CU_JIT_FALLBACK_STRATEGY
#define HIPRTC_JIT_GENERATE_DEBUG_INFO CU_JIT_GENERATE_DEBUG_INFO
#define HIPRTC_JIT_LOG_VERBOSE CU_JIT_LOG_VERBOSE
#define HIPRTC_JIT_GENERATE_LINE_INFO CU_JIT_GENERATE_LINE_INFO
#define HIPRTC_JIT_CACHE_MODE CU_JIT_CACHE_MODE
#define HIPRTC_JIT_NEW_SM3X_OPT CU_JIT_NEW_SM3X_OPT
#define HIPRTC_JIT_FAST_COMPILE CU_JIT_FAST_COMPILE
#define HIPRTC_JIT_NUM_OPTIONS CU_JIT_NUM_OPTIONS
typedef cudaEvent_t hipEvent_t;
typedef cudaStream_t hipStream_t;
projects/clr/hipamd/src/hip_formatting.hpp
+58 -34
Просмотреть файл
@@ -17,8 +17,8 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. */
#include <hip/hiprtc.h>
#include <hip/hip_runtime_api.h>
#include <hip/hiprtc.h>
inline std::ostream& operator<<(std::ostream& os, const hipTextureFilterMode& s) {
switch (s) {
@@ -344,56 +344,80 @@ inline std::ostream& operator<<(std::ostream& os, const hiprtcResult& s) {
inline std::ostream& operator<<(std::ostream& os, const hipJitOption& s) {
switch (s) {
case hipJitOptionMaxRegisters:
os << "hipJitOptionMaxRegisters";
case HIPRTC_JIT_MAX_REGISTERS:
os << "HIPRTC_JIT_MAX_REGISTERS";
break;
case hipJitOptionThreadsPerBlock:
os << "hipJitOptionThreadsPerBlock";
case HIPRTC_JIT_THREADS_PER_BLOCK:
os << "HIPRTC_JIT_THREADS_PER_BLOCK";
break;
case hipJitOptionWallTime:
os << "hipJitOptionWallTime";
case HIPRTC_JIT_WALL_TIME:
os << "HIPRTC_JIT_WALL_TIME";
break;
case hipJitOptionInfoLogBuffer:
os << "hipJitOptionInfoLogBuffer";
case HIPRTC_JIT_INFO_LOG_BUFFER:
os << "HIPRTC_JIT_INFO_LOG_BUFFER";
break;
case hipJitOptionInfoLogBufferSizeBytes:
os << "hipJitOptionInfoLogBufferSizeBytes";
case HIPRTC_JIT_INFO_LOG_BUFFER_SIZE_BYTES:
os << "HIPRTC_JIT_ERROR_LOG_BUFFER_SIZE_BYTES";
break;
case hipJitOptionErrorLogBuffer:
os << "hipJitOptionErrorLogBuffer";
case HIPRTC_JIT_ERROR_LOG_BUFFER:
os << "HIPRTC_JIT_ERROR_LOG_BUFFER";
break;
case hipJitOptionErrorLogBufferSizeBytes:
os << "hipJitOptionErrorLogBufferSizeBytes";
case HIPRTC_JIT_ERROR_LOG_BUFFER_SIZE_BYTES:
os << "HIPRTC_JIT_ERROR_LOG_BUFFER_SIZE_BYTES";
break;
case hipJitOptionOptimizationLevel:
os << "hipJitOptionOptimizationLevel";
case HIPRTC_JIT_OPTIMIZATION_LEVEL:
os << "HIPRTC_JIT_OPTIMIZATION_LEVEL";
break;
case hipJitOptionTargetFromContext:
os << "hipJitOptionTargetFromContext";
case HIPRTC_JIT_TARGET_FROM_HIPCONTEXT:
os << "HIPRTC_JIT_TARGET_FROM_HIPCONTEXT";
break;
case hipJitOptionTarget:
os << "hipJitOptionTarget";
case HIPRTC_JIT_TARGET:
os << "HIPRTC_JIT_TARGET";
break;
case hipJitOptionFallbackStrategy:
os << "hipJitOptionFallbackStrategy";
case HIPRTC_JIT_FALLBACK_STRATEGY:
os << "HIPRTC_JIT_FALLBACK_STRATEGY";
break;
case hipJitOptionGenerateDebugInfo:
os << "hipJitOptionGenerateDebugInfo";
case HIPRTC_JIT_GENERATE_DEBUG_INFO:
os << "HIPRTC_JIT_GENERATE_DEBUG_INFO";
break;
case hipJitOptionCacheMode:
os << "hipJitOptionCacheMode";
case HIPRTC_JIT_CACHE_MODE:
os << "HIPRTC_JIT_CACHE_MODE";
break;
case hipJitOptionSm3xOpt:
os << "hipJitOptionSm3xOpt";
case HIPRTC_JIT_NEW_SM3X_OPT:
os << "HIPRTC_JIT_NEW_SM3X_OPT";
break;
case hipJitOptionFastCompile:
os << "hipJitOptionFastCompile";
case HIPRTC_JIT_FAST_COMPILE:
os << "HIPRTC_JIT_FAST_COMPILE";
break;
case hipJitOptionNumOptions:
os << "hipJitOptionNumOptions";
case HIPRTC_JIT_GLOBAL_SYMBOL_NAMES:
os << "HIPRTC_JIT_GLOBAL_SYMBOL_NAMES";
break;
case HIPRTC_JIT_GLOBAL_SYMBOL_ADDRESS:
os << "HIPRTC_JIT_GLOBAL_SYMBOL_ADDRESS";
break;
case HIPRTC_JIT_GLOBAL_SYMBOL_COUNT:
os << "HIPRTC_JIT_GLOBAL_SYMBOL_COUNT";
break;
case HIPRTC_JIT_LTO:
os << "HIPRTC_JIT_LTO";
break;
case HIPRTC_JIT_FTZ:
os << "HIPRTC_JIT_FTZ";
break;
case HIPRTC_JIT_PREC_DIV:
os << "HIPRTC_JIT_PREC_DIV";
break;
case HIPRTC_JIT_PREC_SQRT:
os << "HIPRTC_JIT_PREC_SQRT";
break;
case HIPRTC_JIT_FMA:
os << "HIPRTC_JIT_FMA";
break;
case HIPRTC_JIT_NUM_OPTIONS:
os << "HIPRTC_JIT_NUM_OPTIONS";
break;
default:
os << "hipJitOptionMaxRegisters";
os << "HIPRTC_JIT_MAX_REGISTERS";
};
return os;
}