The dep files (*.d files) emitted by C compilers usually contain the deduplicated list of included files. One exceptional case is when a header is included by the -include command line option, and also by #include directive. For example, the top Makefile adds the command line option, "-include $(srctree)/include/linux/kconfig.h". You do not need to include <linux/kconfig.h> in every source file. In fact, include/linux/kconfig.h is listed twice in many .*.cmd files due to include/linux/xarray.h having "#include <linux/kconfig.h>". I did not fix that since it is a small redundancy. However, this is more annoying for rustc. rustc emits the dependency for each emission type. For example, cmd_rustc_library emits dep-info, obj, and metadata. So, the emitted *.d file contains the dependency for those 3 targets, which makes fixdep parse the same file 3 times. $ grep rust/alloc/raw_vec.rs rust/.alloc.o.cmd rust/alloc/raw_vec.rs \ rust/alloc/raw_vec.rs \ rust/alloc/raw_vec.rs \ To skip the second parsing, this commit adds a hash table for parsed files, just like we did for CONFIG options.
Showing the changes to scripts/basic (1 of 1 file). Show all
Unified · Split
| @@ -113,7 +113,7 @@ struct item { · 112 unmodified lines | ||
| 113 | 113 | }; |
| 114 | 114 | |
| 115 | 115 | #define HASHSZ 256 |
| 116 | −static struct item *config_hashtab[HASHSZ]; | |
| 116 | +static struct item *config_hashtab[HASHSZ], *file_hashtab[HASHSZ]; | |
| 117 | 117 | |
| 118 | 118 | static unsigned int strhash(const char *str, unsigned int sz) |
| 119 | 119 | { |
| @@ -365,6 +365,10 @@ static void parse_dep_file(char *p, const char *target) · 245 unmodified lines | ||
| 365 | 365 | * name, which will be the original one, and ignore any |
| 366 | 366 | * other source names, which will be intermediate |
| 367 | 367 | * temporary files. |
| 368 | + * | |
| 369 | + * rustc emits the same dependency list for each | |
| 370 | + * emission type. It is enough to list the source name | |
| 371 | + * just once. | |
| 368 | 372 | */ |
| 369 | 373 | if (!saw_any_target) { |
| 370 | 374 | saw_any_target = true; |
| @@ -372,7 +376,8 @@ static void parse_dep_file(char *p, const char *target) · 1 unmodified line | ||
| 372 | 376 | printf("deps_%s := \\\n", target); |
| 373 | 377 | need_parse = true; |
| 374 | 378 | } |
| 375 | − } else if (!is_ignored_file(p, q - p)) { | |
| 379 | + } else if (!is_ignored_file(p, q - p) && | |
| 380 | + !in_hashtable(p, q - p, file_hashtab)) { | |
| 376 | 381 | printf(" %s \\\n", p); |
| 377 | 382 | need_parse = true; |
| 378 | 383 | } |