add script for regenerating asmMap

Author: Ariel Ben-Yehuda

crypto/fipsmodule/aes/asm/aes-gcm-avx2-x86_64.pl

@@ -987,7 +987,7 @@ sub filter_and_print {
         'vpclmulqdq      $0x01, %ymm2, %ymm12, %ymm4' => '.byte 0xc4,0xe3,0x1d,0x44,0xe2,0x01',
         'vpclmulqdq      $0x01, %ymm2, %ymm12, %ymm6' => '.byte 0xc4,0xe3,0x1d,0x44,0xf2,0x01',
         'vpclmulqdq      $0x01, %ymm3, %ymm13, %ymm4' => '.byte 0xc4,0xe3,0x15,0x44,0xe3,0x01',
-        'vpclmulqdq      $0x01, %ymm5, %ymm2, %ymm3' =>  '.byte 0xc4,0xe3,0x6d,0x44,0xdd,0x01',
+        'vpclmulqdq      $0x01, %ymm5, %ymm2, %ymm3' => '.byte 0xc4,0xe3,0x6d,0x44,0xdd,0x01',
         'vpclmulqdq      $0x01, %ymm5, %ymm3, %ymm1' => '.byte 0xc4,0xe3,0x65,0x44,0xcd,0x01',
         'vpclmulqdq      $0x01, %ymm5, %ymm4, %ymm1' => '.byte 0xc4,0xe3,0x5d,0x44,0xcd,0x01',
         'vpclmulqdq      $0x01, %ymm5, %ymm4, %ymm2' => '.byte 0xc4,0xe3,0x5d,0x44,0xd5,0x01',
@@ -1014,6 +1014,11 @@ sub filter_and_print {
         $trimmed =~ s/\s+(#.*)?$//;
         if (exists $asmMap{$trimmed}) {
             $line = $asmMap{$trimmed};
+        } else {
+            if($trimmed =~ /(vpclmulqdq|vaes).*%ymm/) {
+                die ("found instruction not supported under old binutils, please update asmMap with the results of running\n" .
+                     'find target -name "*aes-gcm-avx2*.o" -exec python3 crypto/fipsmodule/aes/asm/make-avx-map-for-old-binutils.py \{\} \; | sort | uniq');
+            }
         }
         print $line,"\n";
     }

crypto/fipsmodule/aes/asm/make-avx-map-for-old-binutils.py

@@ -0,0 +1,42 @@
+#!/usr/bin/python3
+
+import argparse
+import subprocess
+import re
+import sys
+
+PCLMUL_RE = re.compile(r'^\s+[0-9a-f]+:\s+(?P<disas>(?:[0-9a-f][0-9a-f] )+)\s+vpclmul(?P<type>[0-9a-z]+)dq (?P<args>.*%ymm.*)$')
+NON_PCLMUL_RE = re.compile(r'^\s+[0-9a-f]+:\s+(?P<disas>(?:[0-9a-f][0-9a-f] )+)\s+(?P<instruction>vaesenc|vaesenclast) (?P<args>.*%ymm.*)$')
+
+TYPE_MAP = {
+    'lqlq': 0x00,
+    'lqhq': 0x10,
+    'hqlq': 0x01,
+    'hqhq': 0x11,
+}
+
+def hexify_disas(disas):
+    return (' '+disas.strip()).replace(' ', ',0x')[1:]
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog='make-avx-map-for-old-binutils',
+        description='Generate a map file for old binutils from .o files'
+    )
+    parser.add_argument('filename', nargs='+', help='object file to generate map from')
+    parsed = parser.parse_args()
+    for filename in parsed.filename:
+        for line in subprocess.check_output(['objdump', '-d', filename], stderr=sys.stderr).decode('utf-8').split('\n'):
+            if match := PCLMUL_RE.match(line):
+                hexified_disas = hexify_disas(match.group('disas'))
+                ty = TYPE_MAP[match.group('type')]
+                args = match.group('args').replace(',', ', ')
+                print(f"        'vpclmulqdq      $0x{ty:02x}, {args}' => '.byte {hexified_disas}',")
+            elif match := NON_PCLMUL_RE.match(line):
+                hexified_disas = hexify_disas(match.group('disas'))
+                args = match.group('args').replace(',', ', ')
+                print(f"        '{match.group('instruction').ljust(16)}{args}' => '.byte {hexified_disas}',")
+
+
+if __name__ == '__main__':
+    main()