[Modules] Add missing dependencies to clang builtins modulemap

[eladcohen]

Summary

X86 intrinsic header files mm3dnow.h and wmmintrin.h include and depend on mmintrin.h and emmintrin.h respectively.
This patch adds these missing dependencies to the corresponding submodules in the clang builtins modulemap.

[eladcohen]

ping

[bruno]

lib/Headers/module.modulemap

133

The mmx case above makes sense to me, but I find conceptually odd that we need to re-export sse2 in aes module, why not explicitly #include <emmintrin.h> in the source file?

[eladcohen]

lib/Headers/module.modulemap

133

emmintrin.h is already included explicitly in wmmintrin.h & __wmmintrin_aes.h.

If a user includes <x86intrin.h>/<immintrin.h> there is no problem, since the intel submodule has an 'export *' directive and both aes & sse2 will be imported.

However, if the user only includes <wmmintrin.h> (like in the 2nd half of the test I added), and uses modules, then any use of the '___m128i' type (which is used in the aes intrinsics and declared in sse2) will result with the error:
"File tst.c Line 11: missing '#include <emmintrin.h>'; declaration of '___m128i' must be imported from module '_Builtin_intrinsics.intel.sse2' before it is required"

IIUC the possible fixes for this are adding 'export *' or 'export sse2' to the aes submodule.

[bruno]

lib/Headers/module.modulemap

133

I see, if you need the type to use the exported functions it makes sense to re-export it. It might be worth adding a comment // note: for ___m128i

lib/Headers/module.modulemap

explicit module sse4a {
       header "ammintrin.h"
     }
 
     explicit module popcnt {
       header "popcntintrin.h"
     }
 
     explicit module mm3dnow {
+      export mmx
       header "mm3dnow.h"
     }
 
     explicit module aes_pclmul {
       header "wmmintrin.h"
       export aes
       export pclmul
     }
 
     explicit module aes {
+      export sse2
       header "__wmmintrin_aes.h"
     }
 
     explicit module pclmul {
       header "__wmmintrin_pclmul.h"
     }
   }
 

test/Modules/compiler_builtins_x86_submodules.c

+// RUN: rm -rf %t
+// RUN: %clang_cc1 -triple i686-unknown-unknown -target-feature +3dnowa -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t %s -verify -ffreestanding
+
+// expected-no-diagnostics
+
+#include<mm3dnow.h>
+
+__m64 x; // Verify that types which are used by mm3dnow.h
+         // but declared in the mmx submodule get imported
+
+#include<wmmintrin.h>
+
+__m128i y; // Verify that types which are used by wmmintrin.h
+           // but declared in the sse2 submodule get imported
+