Skip to content

next round of fixes to address comments #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 3, 2018
Merged

next round of fixes to address comments #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c4fa8af
Fix spelling of parenthesis.
iotamudelta Jul 2, 2018
79b1f45
Get rid of flush/fsync.
iotamudelta Jul 2, 2018
c1d40f3
Fix enum error that pep8 revealed.
iotamudelta Jul 2, 2018
864dbe4
Line length fix.
iotamudelta Jul 2, 2018
aa799ef
Revert "Line length fix."
iotamudelta Jul 2, 2018
4ad2f9e
Send progress info to stderr by review comment.
iotamudelta Jul 2, 2018
0e14afd
Change to detail? as per review.
iotamudelta Jul 2, 2018
5dac66e
Document what the macros stand for.
iotamudelta Jul 3, 2018
f2ca907
raise exception if no kernel end found.
iotamudelta Jul 3, 2018
9eb80c9
Convert to enum from magic numbers for function disable mode.
iotamudelta Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/amd_build/pyHIPIFY/cuda_to_hip_mappings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,8 @@
"CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE": ("hipGraphicsMapFlagsNone", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY": ("hipGraphicsMapFlagsReadOnly", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD": ("hipGraphicsMapFlagsWriteDiscard", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE": ("hipGraphicsRegisterFlagsNone", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY": ("hipGraphicsRegisterFlagsReadOnly", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_REGISTER_FLAGS_NONE": ("hipGraphicsRegisterFlagsNone", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_REGISTER_FLAGS_READ_ONLY": ("hipGraphicsRegisterFlagsReadOnly", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD": ("hipGraphicsRegisterFlagsWriteDiscard", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LDST": ("hipGraphicsRegisterFlagsSurfaceLoadStore", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
"CU_GRAPHICS_REGISTER_FLAGS_TEXTURE_GATHER": ("hipGraphicsRegisterFlagsTextureGather", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
Expand Down
89 changes: 51 additions & 38 deletions tools/amd_build/pyHIPIFY/hipify-python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import yaml

from functools import reduce
from enum import Enum
from cuda_to_hip_mappings import CUDA_TO_HIP_MAPPINGS


Expand All @@ -56,6 +57,27 @@ class bcolors:
UNDERLINE = '\033[4m'


class disablefuncmode(Enum):
""" How to disable functions
0 - Remove the function entirely (includes the signature).
1 - Stub the function and return an empty object based off the type.
2 - Add !defined(__HIP_PLATFORM_HCC__) preprocessors around the function.
This macro is defined by HIP if the compiler used is hcc.
3 - Add !defined(__HIP_DEVICE_COMPILE__) preprocessors around the function.
This macro is defined by HIP if either hcc or nvcc are used in the device path.
4 - Stub the function and throw an exception at runtime.
5 - Stub the function and throw an assert(0).
6 - Stub the function and keep an empty body.
"""
REMOVE = 0
STUB = 1
HCC_MACRO = 2
DEVICE_MACRO = 3
EXCEPTION = 4
ASSERT = 5
EMPTYBODY = 6


def update_progress_bar(total, progress):
"""
Displays and updates a console progress bar.
Expand All @@ -72,10 +94,10 @@ def update_progress_bar(total, progress):
status)

# Send the progress to stdout.
sys.stdout.write(text)
sys.stderr.write(text)

# Send the buffered text to stdout!
sys.stdout.flush()
sys.stderr.flush()


def filename_ends_with_extension(filename, extensions):
Expand Down Expand Up @@ -159,7 +181,7 @@ def compute_stats(stats):
def processKernelLaunches(string, stats):
""" Replace the CUDA style Kernel launches with the HIP style kernel launches."""
# Concat the namespace with the kernel names. (Find cleaner way of doing this later).
string = re.sub(r'([ ]+)(detail+)::[ ]+\\\n[ ]+', lambda inp: "%s%s::" % (inp.group(1), inp.group(2)), string)
string = re.sub(r'([ ]+)(detail?)::[ ]+\\\n[ ]+', lambda inp: "%s%s::" % (inp.group(1), inp.group(2)), string)

def grab_method_and_template(in_kernel):
# The positions for relevant kernel components.
Expand Down Expand Up @@ -232,6 +254,8 @@ def find_kernel_bounds(string):

# Get kernel ending position (adjust end point past the >>>)
kernel_end = string.find(">>>", kernel_start) + 3
if kernel_end <= 0:
raise InputError("no kernel end found")

# Add to list of traversed kernels
kernel_positions.append({"start": kernel_start, "end": kernel_end,
Expand All @@ -248,11 +272,11 @@ def find_kernel_bounds(string):
# Get kernel components
params = grab_method_and_template(kernel)

# Find paranthesis after kernel launch
paranthesis = string.find("(", kernel["end"])
# Find parenthesis after kernel launch
parenthesis = string.find("(", kernel["end"])

# Extract cuda kernel
cuda_kernel = string[params[0]["start"]:paranthesis + 1]
cuda_kernel = string[params[0]["start"]:parenthesis + 1]

# Keep number of kernel launch params consistent (grid dims, group dims, stream, dynamic shared size)
num_klp = len(extract_arguments(0, kernel["group"].replace("<<<", "(").replace(">>>", ")")))
Expand All @@ -270,24 +294,24 @@ def find_kernel_bounds(string):
return output_string


def find_paranthesis_end(input_string, start):
inside_paranthesis = False
parans = 0
def find_parenthesis_end(input_string, start):
inside_parenthesis = False
parens = 0
pos = start
p_start, p_end = -1, -1

while pos < len(input_string):
if input_string[pos] == "(":
if inside_paranthesis is False:
inside_paranthesis = True
parans = 1
if inside_parenthesis is False:
inside_parenthesis = True
parens = 1
p_start = pos
else:
parans += 1
elif input_string[pos] == ")" and inside_paranthesis:
parans -= 1
parens += 1
elif input_string[pos] == ")" and inside_parenthesis:
parens -= 1

if parans == 0:
if parens == 0:
p_end = pos
return p_start, p_end

Expand All @@ -302,7 +326,7 @@ def disable_asserts(input_string):
output_string = input_string
asserts = list(re.finditer(r"\bassert[ ]*\(", input_string))
for assert_item in asserts:
p_start, p_end = find_paranthesis_end(input_string, assert_item.end() - 1)
p_start, p_end = find_parenthesis_end(input_string, assert_item.end() - 1)
start = assert_item.start()
output_string = output_string.replace(input_string[start:p_end + 1], "")
return output_string
Expand All @@ -321,13 +345,6 @@ def disable_function(input_string, function, replace_style):
e.g. "overlappingIndices"

replace_style - The style to use when stubbing functions.
0 - Remove the function entirely (includes the signature).
1 - Stub the function and return an empty object based off the type.
2 - Add !defined(__HIP_PLATFORM_HCC__) preprocessors around the function.
3 - Add !defined(__HIP_DEVICE_COMPILE__) preprocessors around the function.
4 - Stub the function and throw an exception at runtime.
5 - Stub the function and throw an assert(0).
6 - Stub the function and keep an empty body.
"""
# void (*)(hcrngStateMtgp32 *, int, float *, double, double)
info = {
Expand Down Expand Up @@ -406,11 +423,11 @@ def disable_function(input_string, function, replace_style):
function_body = input_string[info["function_start"]:info["function_end"] + 1]

# Remove the entire function body
if replace_style == 0:
if replace_style == disablefuncmode.REMOVE:
output_string = input_string.replace(function_body, "")

# Stub the function based off its return type.
elif replace_style == 1:
elif replace_style == disablefuncmode.STUB:
# void return type
if func_info["return_type"] == "void" or func_info["return_type"] == "static void":
stub = "%s{\n}" % (function_string)
Expand All @@ -423,32 +440,32 @@ def disable_function(input_string, function, replace_style):
output_string = input_string.replace(function_body, stub)

# Add HIP Preprocessors.
elif replace_style == 2:
elif replace_style == disablefuncmode.HCC_MACRO:
output_string = input_string.replace(
function_body,
"#if !defined(__HIP_PLATFORM_HCC__)\n%s\n#endif" % function_body)

# Add HIP Preprocessors.
elif replace_style == 3:
elif replace_style == disablefuncmode.DEVICE_MACRO:
output_string = input_string.replace(
function_body,
"#if !defined(__HIP_DEVICE_COMPILE__)\n%s\n#endif" % function_body)

# Throw an exception at runtime.
elif replace_style == 4:
elif replace_style == disablefuncmode.EXCEPTION:
stub = "%s{\n%s;\n}" % (
function_string,
'throw std::runtime_error("The function %s is not implemented.")' %
function_string.replace("\n", " "))
output_string = input_string.replace(function_body, stub)

elif replace_style == 5:
elif replace_style == disablefuncmode.ASSERT:
stub = "%s{\n%s;\n}" % (
function_string,
'assert(0)')
output_string = input_string.replace(function_body, stub)

elif replace_style == 6:
elif replace_style == disablefuncmode.EMPTY:
stub = "%s{\n;\n}" % (function_string)
output_string = input_string.replace(function_body, stub)
return output_string
Expand Down Expand Up @@ -501,8 +518,6 @@ def file_specific_replacement(filepath, search_string, replace_string, strict=Fa
f.seek(0)
f.write(contents)
f.truncate()
f.flush()
os.fsync(f)


def file_add_header(filepath, header):
Expand All @@ -514,8 +529,6 @@ def file_add_header(filepath, header):
f.seek(0)
f.write(contents)
f.truncate()
f.flush()
os.fsync(f)


def fix_static_global_kernels(in_txt):
Expand Down Expand Up @@ -875,15 +888,15 @@ def main():
txt = f.read()
for func in functions:
# TODO - Find fix assertions in HIP for device code.
txt = disable_function(txt, func, 5)
txt = disable_function(txt, func, disablefuncmode.ASSERT)

for func in non_hip_functions:
# Disable this function on HIP stack
txt = disable_function(txt, func, 2)
txt = disable_function(txt, func, disablefuncmode.HCC_MACRO)

for func in not_on_device_functions:
# Disable this function when compiling on Device
txt = disable_function(txt, func, 3)
txt = disable_function(txt, func, disablefuncmode.DEVICE_MACRO)

f.seek(0)
f.write(txt)
Expand Down