Skip to content
  • David Blaikie's avatar
    [opaque pointer type] Add textual IR support for explicit type parameter to... · 79e6c749
    David Blaikie authored
    [opaque pointer type] Add textual IR support for explicit type parameter to getelementptr instruction
    
    One of several parallel first steps to remove the target type of pointers,
    replacing them with a single opaque pointer type.
    
    This adds an explicit type parameter to the gep instruction so that when the
    first parameter becomes an opaque pointer type, the type to gep through is
    still available to the instructions.
    
    * This doesn't modify gep operators, only instructions (operators will be
      handled separately)
    
    * Textual IR changes only. Bitcode (including upgrade) and changing the
      in-memory representation will be in separate changes.
    
    * geps of vectors are transformed as:
        getelementptr <4 x float*> %x, ...
      ->getelementptr float, <4 x float*> %x, ...
      Then, once the opaque pointer type is introduced, this will ultimately look
      like:
        getelementptr float, <4 x ptr> %x
      with the unambiguous interpretation that it is a vector of pointers to float.
    
    * address spaces remain on the pointer, not the type:
        getelementptr float addrspace(1)* %x
      ->getelementptr float, float addrspace(1)* %x
      Then, eventually:
        getelementptr float, ptr addrspace(1) %x
    
    Importantly, the massive amount of test case churn has been automated by
    same crappy python code. I had to manually update a few test cases that
    wouldn't fit the script's model (r228970,r229196,r229197,r229198). The
    python script just massages stdin and writes the result to stdout, I
    then wrapped that in a shell script to handle replacing files, then
    using the usual find+xargs to migrate all the files.
    
    update.py:
    import fileinput
    import sys
    import re
    
    ibrep = re.compile(r"(^.*?[^%\w]getelementptr inbounds )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
    normrep = re.compile(       r"(^.*?[^%\w]getelementptr )(((?:<\d* x )?)(.*?)(| addrspace\(\d\)) *\*(|>)(?:$| *(?:%|@|null|undef|blockaddress|getelementptr|addrspacecast|bitcast|inttoptr|\[\[[a-zA-Z]|\{\{).*$))")
    
    def conv(match, line):
      if not match:
        return line
      line = match.groups()[0]
      if len(match.groups()[5]) == 0:
        line += match.groups()[2]
      line += match.groups()[3]
      line += ", "
      line += match.groups()[1]
      line += "\n"
      return line
    
    for line in sys.stdin:
      if line.find("getelementptr ") == line.find("getelementptr inbounds"):
        if line.find("getelementptr inbounds") != line.find("getelementptr inbounds ("):
          line = conv(re.match(ibrep, line), line)
      elif line.find("getelementptr ") != line.find("getelementptr ("):
        line = conv(re.match(normrep, line), line)
      sys.stdout.write(line)
    
    apply.sh:
    for name in "$@"
    do
      python3 `dirname "$0"`/update.py < "$name" > "$name.tmp" && mv "$name.tmp" "$name"
      rm -f "$name.tmp"
    done
    
    The actual commands:
    From llvm/src:
    find test/ -name *.ll | xargs ./apply.sh
    From llvm/src/tools/clang:
    find test/ -name *.mm -o -name *.m -o -name *.cpp -o -name *.c | xargs -I '{}' ../../apply.sh "{}"
    From llvm/src/tools/polly:
    find test/ -name *.ll | xargs ./apply.sh
    
    After that, check-all (with llvm, clang, clang-tools-extra, lld,
    compiler-rt, and polly all checked out).
    
    The extra 'rm' in the apply.sh script is due to a few files in clang's test
    suite using interesting unicode stuff that my python script was throwing
    exceptions on. None of those files needed to be migrated, so it seemed
    sufficient to ignore those cases.
    
    Reviewers: rafael, dexonsmith, grosser
    
    Differential Revision: http://reviews.llvm.org/D7636
    
    llvm-svn: 230786
    79e6c749
Loading